Skip to content

Commit 3c62125

Browse files
flichtenheldcron2
authored andcommitted
GHA: Use CMake 4.0 and apply required fixes
- update vcpkg reference to 856505bb76 This includes a general work-around for the CMake 4.0 compat. See commit a1aebfa9d5eae7cf493e0a706b43915d687bb860. - update lukka/get-cmake action to v4 - update dependency aws/aws-lc to v1.49.1 Change-Id: Ibabb4aa80d7786614dbd6b76bd4cd096f217acfd Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Yuriy Darnobyt <[email protected]> Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg31399.html Signed-off-by: Gert Doering <[email protected]>
1 parent d166fc9 commit 3c62125

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.github/workflows/build.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ jobs:
5454
steps:
5555
- name: Checkout OpenVPN
5656
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
57-
- uses: lukka/get-cmake@56d043d188c3612951d8755da8f4b709ec951ad6 # v3.31.6
57+
- uses: lukka/get-cmake@28983e0d3955dba2bb0a6810caae0c6cf268ec0c # v4.0.0
5858
- name: Install vcpkg
5959
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
6060
with:
61-
vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
61+
vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687
6262
- name: Install dependencies
6363
run: ${VCPKG_ROOT}/vcpkg install openssl lz4 cmocka
6464
- name: configure OpenVPN with cmake
@@ -88,11 +88,11 @@ jobs:
8888
- name: Checkout OpenVPN
8989
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
9090

91-
- uses: lukka/get-cmake@56d043d188c3612951d8755da8f4b709ec951ad6 # v3.31.6
91+
- uses: lukka/get-cmake@28983e0d3955dba2bb0a6810caae0c6cf268ec0c # v4.0.0
9292
- name: Restore from cache and install vcpkg
9393
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
9494
with:
95-
vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
95+
vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687
9696
vcpkgJsonGlob: '**/mingw/vcpkg.json'
9797

9898
- name: Run CMake with vcpkg.json manifest
@@ -276,15 +276,15 @@ jobs:
276276
runs-on: windows-latest
277277
steps:
278278
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
279-
- uses: lukka/get-cmake@56d043d188c3612951d8755da8f4b709ec951ad6 # v3.31.6
279+
- uses: lukka/get-cmake@28983e0d3955dba2bb0a6810caae0c6cf268ec0c # v4.0.0
280280

281281
- name: Install rst2html
282282
run: python -m pip install --upgrade pip docutils
283283

284284
- name: Restore artifacts, or setup vcpkg (do not install any package)
285285
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
286286
with:
287-
vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
287+
vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687
288288
vcpkgJsonGlob: '**/windows/vcpkg.json'
289289

290290
- name: Run CMake with vcpkg.json manifest (NO TESTS)
@@ -471,8 +471,8 @@ jobs:
471471
path: aws-lc
472472
# versioning=semver-coerced
473473
repository: aws/aws-lc
474-
ref: v1.42.0
475-
- uses: lukka/get-cmake@56d043d188c3612951d8755da8f4b709ec951ad6 # v3.31.6
474+
ref: v1.49.1
475+
- uses: lukka/get-cmake@28983e0d3955dba2bb0a6810caae0c6cf268ec0c # v4.0.0
476476
- name: "AWS-LC: build"
477477
run: |
478478
mkdir build

0 commit comments

Comments
 (0)