Skip to content

Commit 08ca982

Browse files
author
Gonzalo Diaz
committed
[Github Actions] C/C++ build/test scripts simplified
1 parent fd0c6ab commit 08ca982

3 files changed

Lines changed: 7 additions & 21 deletions

File tree

.github/workflows/c-coverage.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ jobs:
1818
- name: Checkout repository
1919
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
2020

21+
- name: Install/Adjust VCPKG
22+
shell: bash
23+
run: |
24+
echo "VCPKG_ROOT=/usr/local/share/vcpkg" >> $GITHUB_ENV
25+
2126
- name: Install Tools
2227
run: |
2328
sudo apt-get update
@@ -36,7 +41,6 @@ jobs:
3641
3742
- name: Build
3843
run: |
39-
export VCPKG_ROOT=/usr/local/share/vcpkg
4044
make build
4145
4246
- name: Test / Coverage

.github/workflows/c-linux.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,7 @@ jobs:
2828
- name: Install
2929
shell: bash
3030
run: |
31-
if [ "$RUNNER_OS" == "macOS" ]; then
32-
brew install vcpkg
33-
git clone https://github.com/microsoft/vcpkg "$HOME/vcpkg"
34-
export VCPKG_ROOT="$HOME/vcpkg"
35-
echo "VCPKG_ROOT=$HOME/vcpkg" >> $GITHUB_ENV
36-
elif [ "$RUNNER_OS" == "Linux" ]; then
37-
echo "VCPKG_ROOT=/usr/local/share/vcpkg" >> $GITHUB_ENV
38-
elif [ "$RUNNER_OS" == "Windows" ]; then
39-
echo "VCPKG_ROOT=C:/vcpkg" >> $GITHUB_ENV
40-
fi
31+
echo "VCPKG_ROOT=/usr/local/share/vcpkg" >> $GITHUB_ENV
4132
4233
- name: Check Tools
4334
run: |

.github/workflows/c-windows.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,7 @@ jobs:
2929
- name: Install
3030
shell: bash
3131
run: |
32-
if [ "$RUNNER_OS" == "macOS" ]; then
33-
brew install vcpkg
34-
git clone https://github.com/microsoft/vcpkg "$HOME/vcpkg"
35-
export VCPKG_ROOT="$HOME/vcpkg"
36-
echo "VCPKG_ROOT=$HOME/vcpkg" >> $GITHUB_ENV
37-
elif [ "$RUNNER_OS" == "Linux" ]; then
38-
echo "VCPKG_ROOT=/usr/local/share/vcpkg" >> $GITHUB_ENV
39-
elif [ "$RUNNER_OS" == "Windows" ]; then
40-
echo "VCPKG_ROOT=C:/vcpkg" >> $GITHUB_ENV
41-
fi
32+
echo "VCPKG_ROOT=C:/vcpkg" >> $GITHUB_ENV
4233
4334
- name: Check Tools
4435
run: |

0 commit comments

Comments
 (0)