From 908b0801fa96914ddfb728a5ec62cb510ff09108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 22 Jan 2025 11:06:28 +0100 Subject: [PATCH] Update some workflows to use Ubuntu 24.04 in order to remove manual CMake installation --- .github/workflows/cpp.yml | 12 +----------- .github/workflows/dev.yml | 7 +------ 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml index 66f5e8c7148e0..6504654400912 100644 --- a/.github/workflows/cpp.yml +++ b/.github/workflows/cpp.yml @@ -156,7 +156,7 @@ jobs: build-example: name: C++ Minimal Build Example - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 if: ${{ !contains(github.event.pull_request.title, 'WIP') }} timeout-minutes: 45 steps: @@ -165,11 +165,6 @@ jobs: with: fetch-depth: 0 submodules: recursive - - name: Install CMake 3.25.0 - shell: bash - run: | - ci/scripts/install_cmake.sh 3.25.0 /tmp/local/ - echo "/tmp/local/bin" >> $GITHUB_PATH - name: Check CMake presets run: | cd cpp @@ -329,11 +324,6 @@ jobs: with: fetch-depth: 0 submodules: recursive - - name: Install CMake 3.25.0 - shell: bash - run: | - ci/scripts/install_cmake.sh 3.25.0 /c/cmake - echo "c:\\cmake\\bin" >> $GITHUB_PATH - name: Download Timezone Database shell: bash run: ci/scripts/download_tz_database.sh diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 44cbd66b7fed3..04303f2b1bc9f 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -41,7 +41,7 @@ jobs: lint: name: Lint C++, Python, R, Docker, RAT - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 if: ${{ !contains(github.event.pull_request.title, 'WIP') }} timeout-minutes: 15 steps: @@ -53,11 +53,6 @@ jobs: uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0 with: python-version: 3.12 - - name: Install CMake 3.25.0 - shell: bash - run: | - ci/scripts/install_cmake.sh 3.25.0 /tmp/local/ - echo "/tmp/local/bin" >> $GITHUB_PATH - name: Install pre-commit run: | python -m pip install pre-commit