Skip to content

Commit ee19f30

Browse files
flichtenheldcron2
authored andcommitted
GHA: Pin version of CMake for all builds
Turns out that "apt install cmake" is useless since Github installs also CMake but not as a package. So make sure we control which CMake we get and not Github. Switch to get-cmake action (which also installs ninja) and remove the installation via apt. Change-Id: Ief11d5d7ccae084c863b50054d4e97c71f57d6f0 Signed-off-by: Frank Lichtenheld <[email protected]>
1 parent 39cd7f2 commit ee19f30

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

.github/workflows/build.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
steps:
5555
- name: Checkout OpenVPN
5656
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
57+
- uses: lukka/get-cmake@56d043d188c3612951d8755da8f4b709ec951ad6 # v3.31.6
5758
- name: Install vcpkg
5859
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
5960
with:
@@ -78,10 +79,11 @@ jobs:
7879
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
7980
steps:
8081
- name: Install dependencies
81-
run: sudo apt update && sudo apt install -y mingw-w64 unzip cmake ninja-build build-essential wget python3-docutils man2html-base
82+
run: sudo apt update && sudo apt install -y mingw-w64 unzip build-essential wget python3-docutils man2html-base
8283
- name: Checkout OpenVPN
8384
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8485

86+
- uses: lukka/get-cmake@56d043d188c3612951d8755da8f4b709ec951ad6 # v3.31.6
8587
- name: Restore from cache and install vcpkg
8688
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
8789
with:
@@ -457,13 +459,14 @@ jobs:
457459

458460
steps:
459461
- name: Install dependencies
460-
run: sudo apt update && sudo apt install -y cmake gcc ninja-build golang make liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev
462+
run: sudo apt update && sudo apt install -y gcc golang make liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev
461463
- name: "AWS-LC: checkout"
462464
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
463465
with:
464466
path: aws-lc
465467
repository: aws/aws-lc
466468
ref: v1.42.0
469+
- uses: lukka/get-cmake@56d043d188c3612951d8755da8f4b709ec951ad6 # v3.31.6
467470
- name: "AWS-LC: build"
468471
run: |
469472
mkdir build

0 commit comments

Comments
 (0)