From ef7bd9a2bcff5eccfad4010122c8ae31c23dba45 Mon Sep 17 00:00:00 2001 From: "Jonathan Thorpe (Sony)" Date: Wed, 4 Dec 2024 15:52:09 +0000 Subject: [PATCH] Install CMake and ninja directly on Ubuntu 14.04 --- .github/workflows/build-test.yml | 24 ++++++++++++------------ .github/workflows/src/build-setup.yml | 4 ---- .github/workflows/src/build-test.yml | 16 ++++++++++++---- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index c75a03c6..a4e54ecf 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -124,10 +124,6 @@ jobs: run: | pip install conan~=2.4.1 - - name: 'ubuntu-14.04: install cmake' - if: matrix.os == 'ubuntu-14.04' - uses: lukka/get-cmake@v3.24.2 - - name: install cmake if: matrix.os != 'ubuntu-14.04' uses: lukka/get-cmake@v3.28.3 @@ -670,10 +666,18 @@ jobs: echo "`pwd`/node-v12.16.2-linux-x64/bin" >> $GITHUB_PATH echo "${{ matrix.os }}" if [[ "${{ matrix.os }}" == "ubuntu-14.04" ]]; then - echo "Rename node20" - cd $RUNNER_HOME/actions-runner/externals - mv node20 node20.bak - ln -s node16 node20 + # Install CMake + wget http://www.cmake.org/files/v3.24/cmake-3.24.2.tar.gz + tar -xvzf cmake-3.24.2.tar.gz + cd cmake-3.24.2/ + ./configure + make + make install + sudo update-alternatives --install /usr/bin/cmake cmake /usr/local/bin/cmake 1 --force + # Install ninja + wget https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-linux.zip + sudo unzip ninja-linux.zip -d /usr/local/bin/ + sudo update-alternatives --install /usr/bin/ninja ninja /usr/local/bin/ninja 1 --force fi - name: setup google credentials @@ -690,10 +694,6 @@ jobs: run: | pip install conan~=2.4.1 - - name: 'ubuntu-14.04: install cmake' - if: matrix.os == 'ubuntu-14.04' - uses: lukka/get-cmake@v3.24.2 - - name: install cmake if: matrix.os != 'ubuntu-14.04' uses: lukka/get-cmake@v3.28.3 diff --git a/.github/workflows/src/build-setup.yml b/.github/workflows/src/build-setup.yml index 525d9554..1c15c132 100644 --- a/.github/workflows/src/build-setup.yml +++ b/.github/workflows/src/build-setup.yml @@ -3,10 +3,6 @@ run: | pip install conan~=2.4.1 -- name: 'ubuntu-14.04: install cmake' - if: matrix.os == 'ubuntu-14.04' - uses: lukka/get-cmake@v3.24.2 - - name: install cmake if: matrix.os != 'ubuntu-14.04' uses: lukka/get-cmake@v3.28.3 diff --git a/.github/workflows/src/build-test.yml b/.github/workflows/src/build-test.yml index ca4d3fbe..ea8a7ce9 100644 --- a/.github/workflows/src/build-test.yml +++ b/.github/workflows/src/build-test.yml @@ -184,10 +184,18 @@ jobs: echo "`pwd`/node-v12.16.2-linux-x64/bin" >> $GITHUB_PATH echo "${{ matrix.os }}" if [[ "${{ matrix.os }}" == "ubuntu-14.04" ]]; then - echo "Rename node20" - cd $RUNNER_HOME/actions-runner/externals - mv node20 node20.bak - ln -s node16 node20 + # Install CMake + wget http://www.cmake.org/files/v3.24/cmake-3.24.2.tar.gz + tar -xvzf cmake-3.24.2.tar.gz + cd cmake-3.24.2/ + ./configure + make + make install + sudo update-alternatives --install /usr/bin/cmake cmake /usr/local/bin/cmake 1 --force + # Install ninja + wget https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-linux.zip + sudo unzip ninja-linux.zip -d /usr/local/bin/ + sudo update-alternatives --install /usr/bin/ninja ninja /usr/local/bin/ninja 1 --force fi @import build-and-test