Skip to content

Commit

Permalink
Switch to cmake 15.7 instead of 16.8 to match ninja-build#2041
Browse files Browse the repository at this point in the history
  • Loading branch information
jonesmz committed Aug 30, 2022
1 parent 91ff332 commit 6c76bbd
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:

- name: Install dependencies
run: |
curl -L -O https://github.com/Kitware/CMake/releases/download/v3.16.8/cmake-3.16.8-Linux-x86_64.sh
chmod +x cmake-3.16.8-Linux-x86_64.sh
./cmake-3.16.8-Linux-x86_64.sh --skip-license --prefix=/usr/local
curl -L -O https://github.com/Kitware/CMake/releases/download/v3.15.7/cmake-3.15.7-Linux-x86_64.sh
chmod +x cmake-3.15.7-Linux-x86_64.sh
./cmake-3.15.7-Linux-x86_64.sh --skip-license --prefix=/usr/local
yum install -y make gcc-c++ libasan
- name: Configure
Expand Down Expand Up @@ -63,9 +63,9 @@ jobs:

- name: Install dependencies
run: |
curl -L -O https://github.com/Kitware/CMake/releases/download/v3.16.8/cmake-3.16.8-Linux-x86_64.sh
chmod +x cmake-3.16.8-Linux-x86_64.sh
./cmake-3.16.8-Linux-x86_64.sh --skip-license --prefix=/usr/local
curl -L -O https://github.com/Kitware/CMake/releases/download/v3.15.7/cmake-3.15.7-Linux-x86_64.sh
chmod +x cmake-3.15.7-Linux-x86_64.sh
./cmake-3.15.7-Linux-x86_64.sh --skip-license --prefix=/usr/local
yum install -y make gcc-c++ python3
- name: Bootstrap
Expand Down Expand Up @@ -107,8 +107,8 @@ jobs:
- name: Install dependencies
run: |
apt update
apt install -y ninja-build clang re2c python3-pip
pip3 install cmake==3.16.*
apt install -y make clang re2c python3-pip
pip3 install cmake==3.15.*
- name: Mkdir build
run: |
Expand Down Expand Up @@ -181,9 +181,9 @@ jobs:

- name: Install dependencies
run: |
curl -L -O https://github.com/Kitware/CMake/releases/download/v3.16.8/cmake-3.16.8-Linux-x86_64.sh
chmod +x cmake-3.16.8-Linux-x86_64.sh
./cmake-3.16.8-Linux-x86_64.sh --skip-license --prefix=/usr/local
curl -L -O https://github.com/Kitware/CMake/releases/download/v3.15.7/cmake-3.15.7-Linux-x86_64.sh
chmod +x cmake-3.15.7-Linux-x86_64.sh
./cmake-3.15.7-Linux-x86_64.sh --skip-license --prefix=/usr/local
curl -L -O https://www.mirrorservice.org/sites/dl.fedoraproject.org/pub/epel/7/x86_64/Packages/p/p7zip-16.02-20.el7.x86_64.rpm
curl -L -O https://www.mirrorservice.org/sites/dl.fedoraproject.org/pub/epel/7/x86_64/Packages/p/p7zip-plugins-16.02-20.el7.x86_64.rpm
rpm -U --quiet p7zip-16.02-20.el7.x86_64.rpm
Expand Down

0 comments on commit 6c76bbd

Please sign in to comment.