Skip to content

Commit

Permalink
Install CMake and ninja directly on Ubuntu 14.04
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathan-r-thorpe committed Dec 4, 2024
1 parent 6cda6c7 commit ef7bd9a
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 20 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]

- name: install cmake
if: matrix.os != 'ubuntu-14.04'
uses: lukka/[email protected]
Expand Down Expand Up @@ -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
Expand All @@ -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/[email protected]

- name: install cmake
if: matrix.os != 'ubuntu-14.04'
uses: lukka/[email protected]
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/src/build-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]

- name: install cmake
if: matrix.os != 'ubuntu-14.04'
uses: lukka/[email protected]
Expand Down
16 changes: 12 additions & 4 deletions .github/workflows/src/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ef7bd9a

Please sign in to comment.