From e0970626826e3185c1b7d4b2514fdf2f98eef344 Mon Sep 17 00:00:00 2001 From: Olivier Roussel Date: Wed, 26 Jul 2023 16:31:18 +0200 Subject: [PATCH 1/2] Fix install SofaPython3 CI action. --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64c44547..8626cc09 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,7 +54,11 @@ jobs: SofaPython3_ROOT="$GITHUB_WORKSPACE/SofaPython3" mkdir -p "${{ runner.temp }}/sp3_tmp/zip" "${{ runner.temp }}/sp3_tmp/binaries" "$SofaPython3_ROOT" url="https://github.com/sofa-framework/SofaPython3/releases/download" - url="${url}/release-master-nightly/SofaPython3_master-nightly_python-${{ matrix.python_version }}_for-SOFA-${{ matrix.sofa_branch }}_${{ runner.os }}.zip" + if [[ "${{ matrix.sofa_branch }}" == "master" ]]; then + url="${url}/release-master-nightly/SofaPython3_master-nightly_python-${{ matrix.python_version }}_for-SOFA-master_${{ runner.os }}.zip" + else + url="${url}/release-${{ matrix.sofa_branch }}/SofaPython3_${{ matrix.sofa_branch }}_python-${{ matrix.python_version }}_for-SOFA-${{ matrix.sofa_branch }}_${{ runner.os }}.zip" + fi echo "Getting SofaPython3 from $url" curl --output "${{ runner.temp }}/sp3_tmp/SofaPython3.zip" -L $url unzip -qq "${{ runner.temp }}/sp3_tmp/SofaPython3.zip" -d "${{ runner.temp }}/sp3_tmp/binaries" From 6759e70bcb4987f219aa77586c9b803253031f92 Mon Sep 17 00:00:00 2001 From: Olivier Roussel Date: Thu, 27 Jul 2023 14:57:57 +0200 Subject: [PATCH 2/2] Use non-nightly SofaPython3 builds for CI. --- .github/workflows/ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8626cc09..0581afc4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,11 +54,7 @@ jobs: SofaPython3_ROOT="$GITHUB_WORKSPACE/SofaPython3" mkdir -p "${{ runner.temp }}/sp3_tmp/zip" "${{ runner.temp }}/sp3_tmp/binaries" "$SofaPython3_ROOT" url="https://github.com/sofa-framework/SofaPython3/releases/download" - if [[ "${{ matrix.sofa_branch }}" == "master" ]]; then - url="${url}/release-master-nightly/SofaPython3_master-nightly_python-${{ matrix.python_version }}_for-SOFA-master_${{ runner.os }}.zip" - else - url="${url}/release-${{ matrix.sofa_branch }}/SofaPython3_${{ matrix.sofa_branch }}_python-${{ matrix.python_version }}_for-SOFA-${{ matrix.sofa_branch }}_${{ runner.os }}.zip" - fi + url="${url}/release-${{ matrix.sofa_branch }}/SofaPython3_${{ matrix.sofa_branch }}_python-${{ matrix.python_version }}_for-SOFA-${{ matrix.sofa_branch }}_${{ runner.os }}.zip" echo "Getting SofaPython3 from $url" curl --output "${{ runner.temp }}/sp3_tmp/SofaPython3.zip" -L $url unzip -qq "${{ runner.temp }}/sp3_tmp/SofaPython3.zip" -d "${{ runner.temp }}/sp3_tmp/binaries"