Skip to content

Commit aca645e

Browse files
committed
ci: shuffle steps so we save cache before tests run
Signed-off-by: Larry Gritz <lg@larrygritz.com>
1 parent eeea735 commit aca645e

1 file changed

Lines changed: 20 additions & 20 deletions

File tree

.github/workflows/build-steps.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,26 @@ jobs:
164164
if: inputs.skip_build != '1'
165165
shell: bash
166166
run: src/build-scripts/ci-build.bash
167+
- name: Check out ABI standard
168+
if: inputs.abi_check != ''
169+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
170+
with:
171+
ref: ${{inputs.abi_check}}
172+
path: abi_standard
173+
- name: Build ABI standard
174+
if: inputs.abi_check != ''
175+
shell: bash
176+
run: |
177+
mkdir -p abi_standard/build
178+
pushd abi_standard
179+
src/build-scripts/ci-build.bash
180+
popd
181+
- name: ccache-save
182+
id: ccache-save
183+
uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
184+
with:
185+
path: ./ccache
186+
key: ${{github.job}}-${{inputs.nametag}}-${{steps.ccache_cache_keys.outputs.date}}
167187
- name: Testsuite
168188
if: inputs.skip_tests != '1'
169189
shell: bash
@@ -188,20 +208,6 @@ jobs:
188208
# sonar-scanner --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
189209
time sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" --define sonar.cfamily.build-wrapper-output="$BUILD_WRAPPER_OUT_DIR" --define sonar.cfamily.gcov.reportsPath="_coverage" --define sonar.cfamily.threads="$PARALLEL"
190210
# Consult https://docs.sonarcloud.io/advanced-setup/ci-based-analysis/sonarscanner-cli/ for more information and options
191-
- name: Check out ABI standard
192-
if: inputs.abi_check != ''
193-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
194-
with:
195-
ref: ${{inputs.abi_check}}
196-
path: abi_standard
197-
- name: Build ABI standard
198-
if: inputs.abi_check != ''
199-
shell: bash
200-
run: |
201-
mkdir -p abi_standard/build
202-
pushd abi_standard
203-
src/build-scripts/ci-build.bash
204-
popd
205211
- name: Check ABI
206212
if: inputs.abi_check != ''
207213
shell: bash
@@ -227,9 +233,3 @@ jobs:
227233
build/CMake*
228234
build/testsuite/*/*.*
229235
${{ inputs.extra_artifacts }}
230-
- name: ccache-save
231-
id: ccache-save
232-
uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
233-
with:
234-
path: ./ccache
235-
key: ${{github.job}}-${{inputs.nametag}}-${{steps.ccache_cache_keys.outputs.date}}

0 commit comments

Comments
 (0)