Skip to content

Commit 896f9f6

Browse files
committed
CI: Run Launchable in the build directory
As well as compilers/entrypoint.sh.
1 parent 7a735c4 commit 896f9f6

File tree

1 file changed

+26
-53
lines changed

1 file changed

+26
-53
lines changed

.github/actions/launchable/setup/action.yml

Lines changed: 26 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ inputs:
5757
5858
outputs:
5959
stdout_report_path:
60-
value: ${{ steps.variables.outputs.stdout_report_path }}
60+
value: ${{ steps.global.outputs.stdout_report_path }}
6161
description: >-
6262
Report file path for standard output.
6363
6464
stderr_report_path:
65-
value: ${{ steps.variables.outputs.stderr_report_path }}
65+
value: ${{ steps.global.outputs.stderr_report_path }}
6666
description: >-
6767
Report file path for standard error.
6868
@@ -114,6 +114,8 @@ runs:
114114
echo test_all_report_file='launchable_test_all_report.json' >> $GITHUB_OUTPUT
115115
echo btest_report_file='launchable_btest_report.json' >> $GITHUB_OUTPUT
116116
echo test_spec_report_dir='launchable_test_spec_report' >> $GITHUB_OUTPUT
117+
echo stdout_report_path="launchable_stdout.log" >> $GITHUB_OUTPUT
118+
echo stderr_report_path="launchable_stderr.log" >> $GITHUB_OUTPUT
117119
if: steps.enable-launchable.outputs.enable-launchable
118120

119121
- name: Set environment variables for Launchable
@@ -198,7 +200,10 @@ runs:
198200
fi
199201
if launchable_setup test_spec; then
200202
echo "SPECOPTS=${SPECOPTS:$SPECOPTS }--launchable-test-reports=${test_spec_report_dir}" >> $GITHUB_ENV
203+
echo test_spec_enabled=true >> $GITHUB_OUTPUT
201204
fi
205+
206+
echo launchable_setup_dir=$(pwd) >> $GITHUB_OUTPUT
202207
if: steps.enable-launchable.outputs.enable-launchable
203208
env:
204209
test_all_enabled: ${{ steps.global.outputs.test_all_enabled }}
@@ -208,6 +213,14 @@ runs:
208213
btest_report_file: ${{ steps.global.outputs.btest_report_file }}
209214
test_spec_report_dir: ${{ steps.global.outputs.test_spec_report_dir }}
210215

216+
- name: make test-spec report directory in build directory
217+
shell: bash
218+
working-directory: ${{ inputs.builddir }}
219+
run: mkdir "${test_spec_report_dir}"
220+
if: ${{ steps.setup-launchable.outputs.test_spec_enabled == 'true' }}
221+
env:
222+
test_spec_report_dir: ${{ steps.global.outputs.test_spec_report_dir }}
223+
211224
- name: Clean up test results in Launchable
212225
uses: gacts/run-and-post-run@674528335da98a7afc80915ff2b4b860a0b3553a # v1.4.0
213226
with:
@@ -225,52 +238,11 @@ runs:
225238
btest_report_file: ${{ steps.global.outputs.btest_report_file }}
226239
test_spec_report_dir: ${{ steps.global.outputs.test_spec_report_dir }}
227240

228-
- name: Variables to report Launchable
229-
id: variables
230-
shell: bash
231-
working-directory: ${{ inputs.srcdir }}
232-
run: |
233-
set -x
234-
: # report-path from srcdir
235-
if [ "${srcdir}" = "${{ github.workspace }}" ]; then
236-
dir=
237-
else
238-
# srcdir must be equal to or under workspace
239-
dir=$(echo ${srcdir:+${srcdir}/} | sed 's:[^/][^/]*/:../:g')
240-
fi
241-
if [ "${test_all_enabled}" = "true" ]; then
242-
test_report_path="${dir}${builddir:+${builddir}/}${test_all_report_file}"
243-
echo test_report_path="${test_report_path}" >> $GITHUB_OUTPUT
244-
fi
245-
if [ "${btest_enabled}" = "true" ]; then
246-
btest_report_path="${dir}${builddir:+${builddir}/}${btest_report_file}"
247-
echo btest_report_path="${btest_report_path}" >> $GITHUB_OUTPUT
248-
fi
249-
if [ "${test_spec_enabled}" = "true" ]; then
250-
test_spec_report_path="${dir}${builddir:+${builddir}/}${test_spec_report_dir}"
251-
mkdir "${test_spec_report_path}"
252-
echo test_spec_report_path="${test_spec_report_path}" >> $GITHUB_OUTPUT
253-
fi
254-
stdout_report_path="${dir}${builddir:+${builddir}/}launchable_stdout.log"
255-
stderr_report_path="${dir}${builddir:+${builddir}/}launchable_stderr.log"
256-
echo stdout_report_path="${stdout_report_path}" >> $GITHUB_OUTPUT
257-
echo stderr_report_path="${stderr_report_path}" >> $GITHUB_OUTPUT
258-
if: steps.enable-launchable.outputs.enable-launchable
259-
env:
260-
srcdir: ${{ inputs.srcdir }}
261-
builddir: ${{ inputs.builddir }}
262-
test_all_enabled: ${{ steps.global.outputs.test_all_enabled }}
263-
btest_enabled: ${{ steps.global.outputs.btest_enabled }}
264-
test_spec_enabled: ${{ steps.global.outputs.test_spec_enabled }}
265-
test_all_report_file: ${{ steps.global.outputs.test_all_report_file }}
266-
btest_report_file: ${{ steps.global.outputs.btest_report_file }}
267-
test_spec_report_dir: ${{ steps.global.outputs.test_spec_report_dir }}
268-
269241
- name: Record test results in Launchable
270242
uses: gacts/run-and-post-run@674528335da98a7afc80915ff2b4b860a0b3553a # v1.4.0
271243
with:
272244
shell: bash
273-
working-directory: ${{ inputs.srcdir }}
245+
working-directory: ${{ inputs.builddir }}
274246
post: |
275247
if [[ "${test_all_enabled}" = "true" ]]; then \
276248
launchable record attachment \
@@ -279,7 +251,7 @@ runs:
279251
"${stderr_report_path}"; \
280252
launchable record tests \
281253
--session "${test_all_session}" \
282-
raw "${test_report_path}" || true; \
254+
raw "${test_all_report_file}" || true; \
283255
fi
284256
285257
if [[ "${btest_enabled}" = "true" ]]; then \
@@ -289,7 +261,7 @@ runs:
289261
"${stderr_report_path}"; \
290262
launchable record tests \
291263
--session "${btest_session}" \
292-
raw "${btest_report_path}" || true; \
264+
raw "${btest_report_file}" || true; \
293265
fi
294266
295267
if [[ "${test_spec_enabled}" = "true" ]]; then \
@@ -299,18 +271,19 @@ runs:
299271
"${stderr_report_path}"; \
300272
launchable record tests \
301273
--session "${test_spec_session}" \
302-
raw ${test_spec_report_path}/* || true; \
274+
raw ${test_spec_report_dir}/* || true; \
303275
fi
304-
if: ${{ always() && steps.enable-launchable.outputs.enable-launchable }}
276+
if: ${{ always() && steps.setup-launchable.outcome == 'success' }}
305277
env:
306-
test_report_path: ${{ steps.variables.outputs.test_report_path }}
307-
btest_report_path: ${{ steps.variables.outputs.btest_report_path }}
308-
test_spec_report_path: ${{ steps.variables.outputs.test_spec_report_path }}
278+
test_all_report_file: ${{ steps.global.outputs.test_all_report_file }}
279+
btest_report_file: ${{ steps.global.outputs.btest_report_file }}
280+
test_spec_report_dir: ${{ steps.global.outputs.test_spec_report_dir }}
309281
test_all_enabled: ${{ steps.global.outputs.test_all_enabled }}
310282
btest_enabled: ${{ steps.global.outputs.btest_enabled }}
311283
test_spec_enabled: ${{ steps.global.outputs.test_spec_enabled }}
312284
test_all_session: ${{ steps.setup-launchable.outputs.test_all_session }}
313285
btest_session: ${{ steps.setup-launchable.outputs.btest_session }}
314286
test_spec_session: ${{ steps.setup-launchable.outputs.test_spec_session }}
315-
stdout_report_path: ${{ steps.variables.outputs.stdout_report_path }}
316-
stderr_report_path: ${{ steps.variables.outputs.stderr_report_path }}
287+
stdout_report_path: ${{ steps.global.outputs.stdout_report_path }}
288+
stderr_report_path: ${{ steps.global.outputs.stderr_report_path }}
289+
LAUNCHABLE_SETUP_DIR: ${{ steps.setup-launchable.outputs.launchable_setup_dir }}

0 commit comments

Comments
 (0)