From e37d6fb20d0da9252e5c3ff2d7233585ec466a43 Mon Sep 17 00:00:00 2001 From: Paul Baksic Date: Wed, 14 Oct 2026 18:02:39 +0200 Subject: [PATCH 1/2] Update python version and os name --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed673663..fc9b2dde 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,9 +18,9 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04, macos-14, windows-2022] + os: [ubuntu-24.04, macos-15, windows-latest] sofa_branch: [master] - python_version: ['3.10'] + python_version: ['3.12'] steps: - name: Setup SOFA and environment @@ -31,7 +31,7 @@ jobs: sofa_version: ${{ matrix.sofa_branch }} sofa_scope: 'standard' sofa_with_sofapython3: 'false' - python_version: '${{ matrix.python_version }}' + python_version: ['3.12'] - name: Checkout source code uses: actions/checkout@v2 From 27b03a9efe30c6b33f7074878500723e0a2babeb Mon Sep 17 00:00:00 2001 From: Paul Baksic Date: Wed, 14 Oct 2026 18:14:31 +0200 Subject: [PATCH 2/2] Fix input version for sofa-setup-action --- .github/workflows/ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc9b2dde..b48df33c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,20 +31,20 @@ jobs: sofa_version: ${{ matrix.sofa_branch }} sofa_scope: 'standard' sofa_with_sofapython3: 'false' - python_version: ['3.12'] - + python_version: '${{ matrix.python_version }}' + - name: Checkout source code uses: actions/checkout@v2 with: path: ${{ env.WORKSPACE_SRC_PATH }} - + - name: Setup cache for ccache files if: ${{ runner.os != 'Windows' }} uses: actions/cache@v4 with: path: ${{ env.CCACHE_DIR }} key: ccache_${{ runner.os }} - + - name: Build and install id: build-install shell: bash @@ -59,7 +59,7 @@ jobs: cmake_options="$cmake_options -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache" fi cmake_options="$(echo $cmake_options)" # prettify - + if [[ "$RUNNER_OS" == "Windows" ]]; then cmd //c "${{ steps.sofa.outputs.vs_vsdevcmd }} \ && cd /d $WORKSPACE_BUILD_PATH \ @@ -95,7 +95,7 @@ jobs: id: gen-stub shell: bash run: | - + #Install stubgen ${{ steps.sofa.outputs.python_exe }} -m pip install mypy pybind11-stubgen @@ -114,7 +114,7 @@ jobs: run: | PROJECT_NAME="${GITHUB_REPOSITORY#*/}" echo "PROJECT_NAME=$PROJECT_NAME" | tee -a $GITHUB_ENV - + ARTIFACT_VERSION="${{ steps.sofa.outputs.run_branch }}" if [[ "${{ github.event.inputs.is_nightly }}" == "true" ]]; then ARTIFACT_VERSION="${ARTIFACT_VERSION}-nightly" @@ -135,12 +135,12 @@ jobs: with: name: ${{ env.ARTIFACT_NAME }} path: ${{ env.WORKSPACE_ARTIFACT_PATH }} - + - name: Pepare python environement for tests shell: bash run: | ${{ steps.sofa.outputs.python_exe }} -m pip install rpyc matplotlib - + echo "PYTHONPATH=${{ env.WORKSPACE_BUILD_PATH }}/lib/python3/site-packages" | tee -a $GITHUB_ENV @@ -158,7 +158,7 @@ jobs: - name: Notify dashboard if: always() && startsWith(github.repository, 'sofa-framework') && startsWith(github.ref, 'refs/heads/master') # we are not on a fork and on master - env: + env: DASH_AUTH: ${{ secrets.PLUGIN_DASH }} shell: bash run: | @@ -174,7 +174,7 @@ jobs: echo 'true' || echo 'false') os=$(echo "${{ matrix.os }}" | awk -F- '{ print $1 }') - + curl -X POST -H "X-API-KEY: $DASH_AUTH" -H "Content-Type: application/json" -d \ "{\"id\":\"$(echo "${{ github.repository }}" | awk -F/ '{ print $2 }')\",\ @@ -207,7 +207,7 @@ jobs: done PROJECT_NAME="${GITHUB_REPOSITORY#*/}" echo "PROJECT_NAME=$PROJECT_NAME" | tee -a $GITHUB_ENV - + RELEASE_NAME="${{ github.ref_name }}" RELEASE_TAGNAME="release-${{ github.ref_name }}" BRANCH_NAME="$RELEASE_NAME"