From 36a1f7418ee8f2916a5aa0fec35bc5982c61533d Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 1 Apr 2025 19:44:28 -0700 Subject: [PATCH 1/3] Try out get-cmake action. --- .github/workflows/checks.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index c1ee5375f0..e211ecba6f 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -51,6 +51,9 @@ jobs: # This check succeeds if Doxygen documentation generates without errors. runs-on: ubuntu-22.04 steps: + - uses: lukka/get-cmake@latest + with: + cmakeVersion: "~3.31.0" # <--= optional, use most recent 3.31.x version - uses: actions/checkout@v3 with: submodules: false From 27a1c793bf0305208766ce805fcb45a545e3fcf7 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 1 Apr 2025 19:55:37 -0700 Subject: [PATCH 2/3] Fix indent. --- .github/workflows/checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index e211ecba6f..7500f989be 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -53,7 +53,7 @@ jobs: steps: - uses: lukka/get-cmake@latest with: - cmakeVersion: "~3.31.0" # <--= optional, use most recent 3.31.x version + cmakeVersion: "~3.31.0" - uses: actions/checkout@v3 with: submodules: false From bdd0886ca6e2df93cb2dd834249f39a0a2b5fa54 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 1 Apr 2025 20:00:57 -0700 Subject: [PATCH 3/3] Install cmake 3.31 for other jobs. --- .github/workflows/android.yml | 3 +++ .github/workflows/cpp-packaging.yml | 12 ++++++++++++ .github/workflows/desktop.yml | 6 ++++++ .github/workflows/integration_tests.yml | 12 ++++++++++++ .github/workflows/ios.yml | 3 +++ 5 files changed, 36 insertions(+) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index f1834b3d1c..cdd35932d9 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -51,6 +51,9 @@ jobs: architecture: ${{ fromJson(needs.prepare_matrix.outputs.matrix_architecture) }} python_version: ${{ fromJson(needs.prepare_matrix.outputs.matrix_python_version) }} steps: + - uses: lukka/get-cmake@latest + with: + cmakeVersion: "~3.31.0" - name: setup Xcode version (macos) if: runner.os == 'macOS' run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer diff --git a/.github/workflows/cpp-packaging.yml b/.github/workflows/cpp-packaging.yml index 706a30515a..525062c493 100644 --- a/.github/workflows/cpp-packaging.yml +++ b/.github/workflows/cpp-packaging.yml @@ -90,6 +90,9 @@ jobs: # Binutils 2.35.1 released Sep 19, 2020 binutils_version: "2.35.1" steps: + - uses: lukka/get-cmake@latest + with: + cmakeVersion: "~3.31.0" - name: setup Xcode version (macos) if: runner.os == 'macOS' run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer @@ -188,6 +191,9 @@ jobs: runs-on: macos-13 if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }} steps: + - uses: lukka/get-cmake@latest + with: + cmakeVersion: "~3.31.0" - name: Store git credentials for all git commands # Forces all git commands to use authenticated https, to prevent throttling. shell: bash @@ -248,6 +254,9 @@ jobs: strategy: fail-fast: false steps: + - uses: lukka/get-cmake@latest + with: + cmakeVersion: "~3.31.0" - name: Force Java 11 shell: bash run: echo "JAVA_HOME=${JAVA_HOME_11_X64}" >> $GITHUB_ENV @@ -352,6 +361,9 @@ jobs: architecture: "arm64" steps: + - uses: lukka/get-cmake@latest + with: + cmakeVersion: "~3.31.0" - name: Store git credentials for all git commands # Forces all git commands to use authenticated https, to prevent throttling. shell: bash diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index fa1b792cad..36754a1361 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -95,6 +95,9 @@ jobs: - xcode_version: "11.7" architecture: "arm64" steps: + - uses: lukka/get-cmake@latest + with: + cmakeVersion: "~3.31.0" - name: Store git credentials for all git commands # Forces all git commands to use authenticated https, to prevent throttling. shell: bash @@ -296,6 +299,9 @@ jobs: strategy: fail-fast: false steps: + - uses: lukka/get-cmake@latest + with: + cmakeVersion: "~3.31.0" - uses: actions/checkout@v3 with: ref: ${{needs.check_and_prepare.outputs.github_ref}} diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index ac88fb96dd..ad3a9e6a05 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -286,6 +286,9 @@ jobs: ssl_variant: openssl arch: arm64 steps: + - uses: lukka/get-cmake@latest + with: + cmakeVersion: "~3.31.0" - uses: actions/checkout@v3 with: ref: ${{needs.check_and_prepare.outputs.github_ref}} @@ -424,6 +427,9 @@ jobs: matrix: os: ${{ fromJson(needs.check_and_prepare.outputs.matrix_os) }} steps: + - uses: lukka/get-cmake@latest + with: + cmakeVersion: "~3.31.0" - uses: actions/checkout@v3 with: ref: ${{needs.check_and_prepare.outputs.github_ref}} @@ -535,6 +541,9 @@ jobs: matrix: os: [macos-13] steps: + - uses: lukka/get-cmake@latest + with: + cmakeVersion: "~3.31.0" - uses: actions/checkout@v3 with: ref: ${{needs.check_and_prepare.outputs.github_ref}} @@ -640,6 +649,9 @@ jobs: matrix: os: [macos-13] steps: + - uses: lukka/get-cmake@latest + with: + cmakeVersion: "~3.31.0" - uses: actions/checkout@v3 with: ref: ${{needs.check_and_prepare.outputs.github_ref}} diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 45dbe79caf..942fdf6090 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -44,6 +44,9 @@ jobs: os: [ 'macos-13' ] xcode_version: ${{ fromJson(needs.prepare_matrix.outputs.matrix_xcode_version) }} steps: + - uses: lukka/get-cmake@latest + with: + cmakeVersion: "~3.31.0" - name: Store git credentials for all git commands # Forces all git commands to use authenticated https, to prevent throttling. shell: bash