Skip to content

Commit 651ad3c

Browse files
authored
Fixes and updates to the CI workflow (#1123)
1 parent 754a4ac commit 651ad3c

File tree

1 file changed

+22
-11
lines changed

1 file changed

+22
-11
lines changed

.github/workflows/cpp-python-build.yml

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ jobs:
341341
run: ctest -R fpectl --build-config RelWithDebInfo -V
342342
- name: Test JSBSim
343343
working-directory: build
344-
run: ctest -- parallel $Env:NUMBER_OF_PROCESSORS --build-config RelWithDebInfo --output-on-failure
344+
run: ctest --parallel $Env:NUMBER_OF_PROCESSORS --build-config RelWithDebInfo --output-on-failure
345345

346346
# On failure, upload logs
347347
- name: On failure - Upload logs
@@ -621,7 +621,7 @@ jobs:
621621
touch python/jsbsim/py.typed
622622
cd ../python/dist
623623
tar zxvf *.tar.gz
624-
cp -R JSBSim-*/jsbsim/*.pyi ../../build/python/jsbsim/.
624+
cp -R jsbsim-*/jsbsim/*.pyi ../../build/python/jsbsim/.
625625
echo "::endgroup::"
626626
- name: Configure JSBSim (Windows)
627627
if: runner.os == 'Windows'
@@ -641,7 +641,7 @@ jobs:
641641
Copy-Item -Path .\JSBSim-*\jsbsim\*.pyi -Destination ..\..\build\python\jsbsim
642642
echo "::endgroup::"
643643
- name: Build wheels
644-
uses: pypa/cibuildwheel@v2.16
644+
uses: pypa/cibuildwheel@v2.19
645645
env:
646646
CIBW_BEFORE_ALL_LINUX: |
647647
cd build
@@ -847,8 +847,9 @@ jobs:
847847
# Extract from CMake the project version number at the next release.
848848
echo "message(STATUS \"JSBSIM_VERSION:\${PROJECT_VERSION}\")" >> src/CMakeLists.txt
849849
export FUTURE_VERSION=`cmake . | grep JSBSIM_VERSION | awk -F':' '{print $2}'`
850+
echo "FUTURE_VERSION=$FUTURE_VERSION" >> $GITHUB_ENV
850851
# Extract the project old version number
851-
export OLD_VERSION=`egrep 'JSBSim-([0-9]+\.)+[0-9]+-setup.exe' README.md | awk -F'JSBSim-' '{ print $2}' | awk -F'-setup.exe' '{ print $1}'`
852+
export OLD_VERSION=`egrep 'JSBSim-([0-9]+\.)+[0-9]+-setup.exe' README.md | awk -F'JSBSim-' '{ print $2}' | awk -F'-setup.exe' '{ print $1}' | sed 's/\./\\\\./g'`
852853
echo "OLD_VERSION=$OLD_VERSION" >> $GITHUB_ENV
853854
# Update references to the current stable version in README.md
854855
sed -ri 's/_'"$OLD_VERSION"'-[0-9]+.amd64.deb/_'"$VERSION"'-'"$GITHUB_RUN_NUMBER"'.amd64.deb/g' README.md
@@ -895,6 +896,13 @@ jobs:
895896
needs: Stable-Release
896897
name: Deploy Documentation
897898
runs-on: ubuntu-latest
899+
environment:
900+
name: github-pages
901+
url: ${{ steps.deployment.outputs.pages_url }}
902+
permissions:
903+
contents: read
904+
pages: write
905+
id-token: write
898906
steps:
899907
- name: Install Ubuntu packages
900908
run: |
@@ -923,10 +931,13 @@ jobs:
923931
pip install jsbsim --no-index -f .
924932
touch documentation/html/.nojekyll
925933
sphinx-build -b html documentation documentation/html/python
926-
- name: Publish docs to GitHub Pages
927-
uses: crazy-max/ghaction-github-pages@v4
928-
with:
929-
target_branch: gh-pages
930-
build_dir: build/documentation/html
931-
env:
932-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
934+
- name: Setup Pages
935+
uses: actions/configure-pages@v5
936+
- name: Upload Pages Artifact
937+
uses: actions/upload-pages-artifact@v3
938+
with:
939+
# upload entire directory
940+
path: 'build/documentation/html'
941+
- name: Deploy to GitHub Pages
942+
id: deployment
943+
uses: actions/deploy-pages@v4

0 commit comments

Comments
 (0)