Skip to content

Commit 3d433fc

Browse files
authored
Merge pull request #589 from K-os/gh_actions_fail_on_err
GH-Actions fail on error
2 parents 1e134d2 + 318ead0 commit 3d433fc

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.github/workflows/Build.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,11 @@ jobs:
7777
7878
- name: MSVC build
7979
if: contains( matrix.config.generators, 'Visual Studio' )
80+
shell: pwsh
8081
run: |
81-
cmake -S . -B build/static -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=0 -DVVENC_OVERRIDE_COMPILER_CHECK=ON -A "${{ matrix.config.msvc_arch }}"
82+
$ErrorActionPreference = 'stop'
83+
$PSNativeCommandUseErrorActionPreference = $true
84+
cmake -S . -B build/static -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=0 -A "${{ matrix.config.msvc_arch }}"
8285
cmake --build build/static --config Release
83-
cmake -S . -B build/shared -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1 -DVVENC_OVERRIDE_COMPILER_CHECK=ON -A "${{ matrix.config.msvc_arch }}"
86+
cmake -S . -B build/shared -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1 -A "${{ matrix.config.msvc_arch }}"
8487
cmake --build build/shared --config Release
85-
shell: cmd

.gitlab-ci-internal.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,23 +257,20 @@ test_vs2022_Win32:
257257
extends: .build_test_msvc_template
258258
variables:
259259
MSVC_ARCH: Win32
260-
CONFIG_OPTIONS: "-DVVENC_OVERRIDE_COMPILER_CHECK=1"
261260
tags:
262261
- vs2022
263262

264263
test_vs2022:
265264
extends: .build_test_msvc_template
266265
variables:
267266
MSVC_ARCH: x64
268-
CONFIG_OPTIONS: "-DVVENC_OVERRIDE_COMPILER_CHECK=1"
269267
tags:
270268
- vs2022
271269

272270
test_vs2022_arm64:
273271
extends: .build_test_msvc_template
274272
variables:
275273
MSVC_ARCH: arm64
276-
CONFIG_OPTIONS: "-DVVENC_OVERRIDE_COMPILER_CHECK=1"
277274
tags:
278275
- vs2022-arm
279276

0 commit comments

Comments
 (0)