Skip to content

Commit 34b813c

Browse files
committed
Fix up the workflow to use toolshed
1 parent 42ea9d6 commit 34b813c

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

.github/workflows/main.yml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ env:
55
jobs:
66
debug:
77
runs-on: ubuntu-latest
8+
container: ghcr.io/opencyphal/toolshed:ts20.4.1
89
strategy:
910
matrix:
1011
toolchain: ['clang', 'gcc']
@@ -16,24 +17,17 @@ jobs:
1617
c-compiler: clang
1718
cxx-compiler: clang++
1819
steps:
19-
- uses: actions/checkout@v2
20-
- run: |
21-
wget https://apt.llvm.org/llvm.sh
22-
chmod +x llvm.sh
23-
sudo ./llvm.sh $LLVM_VERSION
24-
sudo apt update -y && sudo apt upgrade -y
25-
sudo apt-get -y install gcc-multilib g++-multilib clang-tidy-$LLVM_VERSION
26-
sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-$LLVM_VERSION 50
27-
clang-tidy --version
20+
- uses: actions/checkout@v3
2821
- run: >
2922
cmake
3023
-B ${{ github.workspace }}/build
3124
-DCMAKE_BUILD_TYPE=Debug
3225
-DCMAKE_C_COMPILER=${{ matrix.c-compiler }}
3326
-DCMAKE_CXX_COMPILER=${{ matrix.cxx-compiler }}
3427
tests
35-
- working-directory: ${{github.workspace}}/build
28+
- name: make
3629
run: |
30+
cd ${{ github.workspace }}/build
3731
make VERBOSE=1
3832
make test
3933
- uses: actions/upload-artifact@v2
@@ -45,6 +39,7 @@ jobs:
4539

4640
optimizations:
4741
runs-on: ubuntu-latest
42+
container: ghcr.io/opencyphal/toolshed:ts20.4.1
4843
strategy:
4944
matrix:
5045
toolchain: ['clang', 'gcc']
@@ -57,10 +52,7 @@ jobs:
5752
c-compiler: clang
5853
cxx-compiler: clang++
5954
steps:
60-
- uses: actions/checkout@v2
61-
- run: |
62-
sudo apt update -y && sudo apt upgrade -y
63-
sudo apt install gcc-multilib g++-multilib
55+
- uses: actions/checkout@v3
6456
- run: >
6557
cmake
6658
-B ${{ github.workspace }}/build
@@ -69,8 +61,9 @@ jobs:
6961
-DCMAKE_CXX_COMPILER=${{ matrix.cxx-compiler }}
7062
-DNO_STATIC_ANALYSIS=1
7163
tests
72-
- working-directory: ${{github.workspace}}/build
64+
- name: make
7365
run: |
66+
cd ${{ github.workspace }}/build
7467
make VERBOSE=1
7568
make test
7669
- uses: actions/upload-artifact@v2

0 commit comments

Comments
 (0)