Skip to content

Commit 19c25d5

Browse files
committed
Merge branch 'master' into release
2 parents 8b893a4 + 4d07910 commit 19c25d5

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/vcpkg_build_master.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
# The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm.
9191
# Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already).
9292
key: |
93-
et-2-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-${{ matrix.os }}-${{ matrix.gcc }}
93+
et-2-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-${{ matrix.os }}-${{ matrix.gcc }}-master
9494
9595
- name: Show content of workspace after cache has been restored
9696
run: find $RUNNER_WORKSPACE
@@ -104,17 +104,17 @@ jobs:
104104
CC: gcc-${{ matrix.gcc }}
105105
CXX: g++-${{ matrix.gcc }}
106106
run: |
107-
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_BUILD_TYPE=release
107+
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo
108108
if: matrix.os == 'ubuntu-latest'
109109

110110
- name: Install dependencies and generate project files (mac)
111111
run: |
112-
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_BUILD_TYPE=release
112+
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo
113113
if: matrix.os == 'macos-latest'
114114

115115
- name: Install dependencies and generate project files (windows)
116116
run: |
117-
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_BUILD_TYPE=release
117+
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo
118118
if: matrix.os == 'windows-latest'
119119

120120
# Build the whole project with Ninja (which is spawn by CMake).

.github/workflows/vcpkg_build_release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
# The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm.
9191
# Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already).
9292
key: |
93-
et-2-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-${{ matrix.os }}-${{ matrix.gcc }}
93+
et-2-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-${{ matrix.os }}-${{ matrix.gcc }}-release
9494
9595
- name: Show content of workspace after cache has been restored
9696
run: find $RUNNER_WORKSPACE
@@ -104,18 +104,18 @@ jobs:
104104
CC: gcc-${{ matrix.gcc }}
105105
CXX: g++-${{ matrix.gcc }}
106106
run: |
107-
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_BUILD_TYPE=release
107+
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo
108108
if: matrix.os == 'ubuntu-latest'
109109
- name: Install dependencies and generate project files (mac)
110110
env:
111111
CC: gcc-${{ matrix.gcc }}
112112
CXX: g++-${{ matrix.gcc }}
113113
run: |
114-
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_BUILD_TYPE=release
114+
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo
115115
if: matrix.os == 'macos-latest'
116116
- name: Install dependencies and generate project files (windows)
117117
run: |
118-
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_BUILD_TYPE=release
118+
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo
119119
if: matrix.os == 'windows-latest'
120120
# Build the whole project with Ninja (which is spawn by CMake).
121121
- name: Build

0 commit comments

Comments
 (0)