Skip to content

Commit 455d713

Browse files
authored
Update github actions dependencies to make CI pass (#55)
1 parent 8734a57 commit 455d713

File tree

4 files changed

+35
-30
lines changed

4 files changed

+35
-30
lines changed

.github/workflows/ci.yaml

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
pull_request:
66
release:
7-
types: [ published ]
7+
types: [published]
88

99
env:
1010
BUILD_TYPE: Debug
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121

2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v6
2424
with:
2525
submodules: true
2626

@@ -60,21 +60,21 @@ jobs:
6060

6161
- name: Upload test logs
6262
if: ${{ always() }}
63-
uses: actions/upload-artifact@v3
63+
uses: actions/upload-artifact@v6
6464
with:
6565
name: testing-shl-${{ matrix.build_single_header }}
6666
path: ${{github.workspace}}/build/Testing
6767

6868
- name: Upload coverage
6969
if: ${{ matrix.build_single_header == 'OFF' }}
70-
uses: actions/upload-artifact@v3
70+
uses: actions/upload-artifact@v6
7171
with:
7272
name: coverage
7373
path: ${{github.workspace}}/build/coverage_xml.xml
7474

7575
- name: Upload generated header
7676
if: ${{ matrix.build_single_header == 'ON' }}
77-
uses: actions/upload-artifact@v3
77+
uses: actions/upload-artifact@v6
7878
with:
7979
name: single-header
8080
path: ${{github.workspace}}/lib/shl/embedded_cli.h
@@ -86,23 +86,23 @@ jobs:
8686
files: ${{ github.workspace }}/build/coverage_xml.xml
8787

8888
build-arduino-example:
89-
runs-on: ubuntu-latest
89+
runs-on: ubuntu-latest
9090

91-
steps:
92-
- uses: actions/checkout@v3
91+
steps:
92+
- uses: actions/checkout@v6
9393

94-
- name: Generate single header lib
95-
working-directory: ${{github.workspace}}/lib
96-
run: python3 build-shl.py
94+
- name: Generate single header lib
95+
working-directory: ${{github.workspace}}/lib
96+
run: python3 build-shl.py
9797

98-
- name: Copy single header file to sketch dir
99-
run: cp ${{github.workspace}}/lib/shl/embedded_cli.h ${{github.workspace}}/examples/arduino-cli/embedded_cli.h
98+
- name: Copy single header file to sketch dir
99+
run: cp ${{github.workspace}}/lib/shl/embedded_cli.h ${{github.workspace}}/examples/arduino-cli/embedded_cli.h
100100

101-
- name: Compile arduino sketch
102-
uses: arduino/compile-sketches@v1
103-
with:
104-
sketch-paths: |
105-
- examples/arduino-cli
101+
- name: Compile arduino sketch
102+
uses: arduino/compile-sketches@v1
103+
with:
104+
sketch-paths: |
105+
- examples/arduino-cli
106106
107107
build-win:
108108
strategy:
@@ -115,7 +115,7 @@ jobs:
115115
runs-on: windows-2019
116116

117117
steps:
118-
- uses: actions/checkout@v3
118+
- uses: actions/checkout@v6
119119
with:
120120
submodules: true
121121

@@ -132,26 +132,27 @@ jobs:
132132

133133
- name: Test
134134
working-directory: ${{github.workspace}}/build
135-
run: ctest -C $BUILD_TYPE
135+
shell: bash
136+
run: ctest -C Release
136137

137138
- name: Upload test logs
138139
if: ${{ always() }}
139-
uses: actions/upload-artifact@v3
140+
uses: actions/upload-artifact@v6
140141
with:
141142
name: testing-win-${{ matrix.arch }}
142143
path: ${{github.workspace}}/build/Testing
143144

144145
- name: Upload windows examples
145-
uses: actions/upload-artifact@v3
146+
uses: actions/upload-artifact@v6
146147
with:
147148
name: windows-example-${{ matrix.arch }}
148149
path: ${{github.workspace}}/build/examples/win32-example/Release/embedded_cli_win32.exe
149150

150151
build-mac:
151-
runs-on: macos-12
152+
runs-on: macos-14
152153

153154
steps:
154-
- uses: actions/checkout@v3
155+
- uses: actions/checkout@v6
155156
with:
156157
submodules: true
157158

@@ -172,17 +173,17 @@ jobs:
172173

173174
- name: Upload test logs
174175
if: ${{ always() }}
175-
uses: actions/upload-artifact@v3
176+
uses: actions/upload-artifact@v6
176177
with:
177178
name: testing-mac
178179
path: ${{github.workspace}}/build/Testing
179180

180181
add-release-assets:
181182
runs-on: ubuntu-latest
182183
if: github.event_name == 'release'
183-
needs: [ build ]
184+
needs: [build]
184185
steps:
185-
- uses: actions/download-artifact@v2
186+
- uses: actions/download-artifact@v7
186187
with:
187188
path: artifacts
188189

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
id: version
1515

1616
- name: Release
17-
uses: softprops/action-gh-release@v1
17+
uses: softprops/action-gh-release@v2
1818
with:
1919
token: ${{ secrets.RELEASE_ACCESS_TOKEN }}
2020
name: embedded-cli ${{ steps.version.outputs.version }}
2121
draft: false
22-
prerelease: true
22+
prerelease: true

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ if (${BUILD_TESTS})
4545
NAME coverage_xml
4646
EXECUTABLE ctest
4747
DEPENDENCIES embedded_cli_tests
48-
EXCLUDE "tests/*")
48+
EXCLUDE "tests/*"
49+
"deps/catch2/*"
50+
"build/deps/*")
4951
endif ()
5052
endif ()

cmake-modules/CodeCoverage.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,7 @@ function(setup_target_for_coverage_gcovr_xml)
334334

335335
# Running gcovr
336336
COMMAND ${GCOVR_PATH} --xml
337+
--gcov-ignore-errors=no_working_dir_found
337338
-r ${BASEDIR} ${GCOVR_EXCLUDE_ARGS}
338339
--object-directory=${PROJECT_BINARY_DIR}
339340
-o ${Coverage_NAME}.xml
@@ -410,6 +411,7 @@ function(setup_target_for_coverage_gcovr_html)
410411

411412
# Running gcovr
412413
COMMAND ${GCOVR_PATH} --html --html-details
414+
--gcov-ignore-errors=no_working_dir_found
413415
-r ${BASEDIR} ${GCOVR_EXCLUDE_ARGS}
414416
--object-directory=${PROJECT_BINARY_DIR}
415417
-o ${Coverage_NAME}/index.html

0 commit comments

Comments
 (0)