Skip to content

Commit 48d2266

Browse files
nobunobu
committed
CI: Store session info in variables directly
1 parent c59f66b commit 48d2266

2 files changed

Lines changed: 30 additions & 51 deletions

File tree

‎.github/actions/compilers/entrypoint.sh‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ setup_launchable() {
8686
local github_ref="${GITHUB_REF//\//_}"
8787
local build_name="${github_ref}"_"${GITHUB_PR_HEAD_SHA}"
8888
launchable record build --name "${build_name}" || true
89-
launchable record session \
89+
btest_session=$(launchable record session \
9090
--build "${build_name}" \
9191
--flavor test_task=test \
9292
--flavor workflow=Compilations \
@@ -96,10 +96,10 @@ setup_launchable() {
9696
--flavor optflags="${INPUT_OPTFLAGS}" \
9797
--flavor cppflags="${INPUT_CPPFLAGS}" \
9898
--test-suite btest \
99-
> "${builddir}"/${btest_session_file} \
99+
) \
100100
&& btests+=--launchable-test-reports="${btest_report_path}" || :
101101
if [ "$INPUT_CHECK" = "true" ]; then
102-
launchable record session \
102+
test_all_session=$(launchable record session \
103103
--build "${build_name}" \
104104
--flavor test_task=test-all \
105105
--flavor workflow=Compilations \
@@ -109,10 +109,10 @@ setup_launchable() {
109109
--flavor optflags="${INPUT_OPTFLAGS}" \
110110
--flavor cppflags="${INPUT_CPPFLAGS}" \
111111
--test-suite test-all \
112-
> "${builddir}"/${test_all_session_file} \
112+
) \
113113
&& tests+=--launchable-test-reports="${test_report_path}" || :
114114
mkdir "${builddir}"/"${test_spec_report_path}"
115-
launchable record session \
115+
test_spec_session=$(launchable record session \
116116
--build "${build_name}" \
117117
--flavor test_task=test-spec \
118118
--flavor workflow=Compilations \
@@ -122,26 +122,23 @@ setup_launchable() {
122122
--flavor optflags="${INPUT_OPTFLAGS}" \
123123
--flavor cppflags="${INPUT_CPPFLAGS}" \
124124
--test-suite test-spec \
125-
> "${builddir}"/${test_spec_session_file} \
125+
) \
126126
&& spec_opts+=--launchable-test-reports="${test_spec_report_path}" || :
127127
fi
128128
}
129129
launchable_record_test() {
130130
pushd "${builddir}"
131-
grouped launchable record tests --session "$(cat "${btest_session_file}")" raw "${btest_report_path}" || true
131+
grouped launchable record tests --session "${btest_session}" raw "${btest_report_path}" || true
132132
if [ "$INPUT_CHECK" = "true" ]; then
133-
grouped launchable record tests --session "$(cat "${test_all_session_file}")" raw "${test_report_path}" || true
134-
grouped launchable record tests --session "$(cat "${test_spec_session_file}")" raw "${test_spec_report_path}"/* || true
133+
grouped launchable record tests --session "${test_all_session}" raw "${test_report_path}" || true
134+
grouped launchable record tests --session "${test_spec_session}" raw "${test_spec_report_path}"/* || true
135135
fi
136136
}
137137
if [ "$LAUNCHABLE_ENABLED" = "true" ]; then
138138
echo "::group::Setup Launchable"
139139
btest_report_path='launchable_bootstraptest.json'
140140
test_report_path='launchable_test_all.json'
141141
test_spec_report_path='launchable_test_spec_report'
142-
test_all_session_file='launchable_test_all_session.txt'
143-
btest_session_file='launchable_btest_session.txt'
144-
test_spec_session_file='launchable_test_spec_session.txt'
145142
setup_pid=$$
146143
(sleep 180; echo "setup_launchable timed out; killing"; kill -INT "-$setup_pid" 2> /dev/null) & sleep_pid=$!
147144
launchable_failed=false

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

Lines changed: 21 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,6 @@ runs:
111111
echo test_all_enabled="${test_all_enabled}" >> $GITHUB_OUTPUT
112112
echo btest_enabled="${btest_enabled}" >> $GITHUB_OUTPUT
113113
echo test_spec_enabled="${test_spec_enabled}" >> $GITHUB_OUTPUT
114-
echo test_all_session_file='launchable_test_all_session.txt' >> $GITHUB_OUTPUT
115-
echo btest_session_file='launchable_btest_session.txt' >> $GITHUB_OUTPUT
116-
echo test_spec_session_file='launchable_test_spec_session.txt' >> $GITHUB_OUTPUT
117114
echo test_all_report_file='launchable_test_all_report.json' >> $GITHUB_OUTPUT
118115
echo btest_report_file='launchable_btest_report.json' >> $GITHUB_OUTPUT
119116
echo test_spec_report_dir='launchable_test_spec_report' >> $GITHUB_OUTPUT
@@ -171,86 +168,71 @@ runs:
171168
fi
172169
launchable record build --name "${build_name}"
173170
if [ "${test_all_enabled}" = "true" ]; then
174-
launchable record session \
171+
test_all_session=$(launchable record session \
175172
--build "${build_name}" \
176173
--observation \
177174
--flavor os="${{ inputs.os }}" \
178175
--flavor test_task="${{ inputs.test-task }}" \
179176
--flavor test_opts="${test_opts}" \
180177
--flavor workflow="${{ github.workflow }}" \
181178
--test-suite ${test_all_test_suite} \
182-
> "${test_all_session_file}"
179+
)
183180
launchable subset \
184181
--get-tests-from-previous-sessions \
185182
--non-blocking \
186183
--target 90% \
187-
--session "$(cat "${test_all_session_file}")" \
184+
--session "${test_all_session}" \
188185
raw > /dev/null
186+
echo test_all_session="${test_all_session}" >> $GITHUB_OUTPUT
189187
echo "TESTS=${TESTS} --launchable-test-reports=${test_all_report_file}" >> $GITHUB_ENV
190188
fi
191189
if [ "${btest_enabled}" = "true" ]; then
192-
launchable record session \
190+
btest_session=$(launchable record session \
193191
--build "${build_name}" \
194192
--observation \
195193
--flavor os="${{ inputs.os }}" \
196194
--flavor test_task="${{ inputs.test-task }}" \
197195
--flavor test_opts="${test_opts}" \
198196
--flavor workflow="${{ github.workflow }}" \
199197
--test-suite ${btest_test_suite} \
200-
> "${btest_session_file}"
198+
)
201199
launchable subset \
202200
--get-tests-from-previous-sessions \
203201
--non-blocking \
204202
--target 90% \
205-
--session "$(cat "${btest_session_file}")" \
203+
--session "${btest_session}" \
206204
raw > /dev/null
205+
echo btest_session="${btest_session}" >> $GITHUB_OUTPUT
207206
echo "BTESTS=${BTESTS} --launchable-test-reports=${btest_report_file}" >> $GITHUB_ENV
208207
fi
209208
if [ "${test_spec_enabled}" = "true" ]; then
210-
launchable record session \
209+
test_spec_session=$(launchable record session \
211210
--build "${build_name}" \
212211
--observation \
213212
--flavor os="${{ inputs.os }}" \
214213
--flavor test_task="${{ inputs.test-task }}" \
215214
--flavor test_opts="${test_opts}" \
216215
--flavor workflow="${{ github.workflow }}" \
217216
--test-suite ${test_spec_test_suite} \
218-
> "${test_spec_session_file}"
217+
)
219218
launchable subset \
220219
--get-tests-from-previous-sessions \
221220
--non-blocking \
222221
--target 90% \
223-
--session "$(cat "${test_spec_session_file}")" \
222+
--session "${test_spec_session}" \
224223
raw > /dev/null
224+
echo test_spec_session="${test_spec_session}" >> $GITHUB_OUTPUT
225225
echo "SPECOPTS=${SPECOPTS} --launchable-test-reports=${test_spec_report_dir}" >> $GITHUB_ENV
226226
fi
227227
if: steps.enable-launchable.outputs.enable-launchable
228228
env:
229229
test_all_enabled: ${{ steps.global.outputs.test_all_enabled }}
230230
btest_enabled: ${{ steps.global.outputs.btest_enabled }}
231231
test_spec_enabled: ${{ steps.global.outputs.test_spec_enabled }}
232-
test_all_session_file: ${{ steps.global.outputs.test_all_session_file }}
233-
btest_session_file: ${{ steps.global.outputs.btest_session_file }}
234-
test_spec_session_file: ${{ steps.global.outputs.test_spec_session_file }}
235232
test_all_report_file: ${{ steps.global.outputs.test_all_report_file }}
236233
btest_report_file: ${{ steps.global.outputs.btest_report_file }}
237234
test_spec_report_dir: ${{ steps.global.outputs.test_spec_report_dir }}
238235

239-
- name: Clean up session files in Launchable
240-
uses: gacts/run-and-post-run@674528335da98a7afc80915ff2b4b860a0b3553a # v1.4.0
241-
with:
242-
shell: bash
243-
working-directory: ${{ inputs.srcdir }}
244-
post: |
245-
rm -f "${test_all_session_file}"
246-
rm -f "${btest_session_file}"
247-
rm -f "${test_spec_session_file}"
248-
if: always() && steps.setup-launchable.outcome == 'success'
249-
env:
250-
test_all_session_file: ${{ steps.global.outputs.test_all_session_file }}
251-
btest_session_file: ${{ steps.global.outputs.btest_session_file }}
252-
test_spec_session_file: ${{ steps.global.outputs.test_spec_session_file }}
253-
254236
- name: Clean up test results in Launchable
255237
uses: gacts/run-and-post-run@674528335da98a7afc80915ff2b4b860a0b3553a # v1.4.0
256238
with:
@@ -317,31 +299,31 @@ runs:
317299
post: |
318300
if [[ "${test_all_enabled}" = "true" ]]; then \
319301
launchable record attachment \
320-
--session "$(cat "${test_all_session_file}")" \
302+
--session "${test_all_session}" \
321303
"${stdout_report_path}" \
322304
"${stderr_report_path}"; \
323305
launchable record tests \
324-
--session "$(cat "${test_all_session_file}")" \
306+
--session "${test_all_session}" \
325307
raw "${test_report_path}" || true; \
326308
fi
327309
328310
if [[ "${btest_enabled}" = "true" ]]; then \
329311
launchable record attachment \
330-
--session "$(cat "${btest_session_file}")" \
312+
--session "${btest_session}" \
331313
"${stdout_report_path}" \
332314
"${stderr_report_path}"; \
333315
launchable record tests \
334-
--session "$(cat "${btest_session_file}")" \
316+
--session "${btest_session}" \
335317
raw "${btest_report_path}" || true; \
336318
fi
337319
338320
if [[ "${test_spec_enabled}" = "true" ]]; then \
339321
launchable record attachment \
340-
--session "$(cat "${test_spec_session_file}")" \
322+
--session "${test_spec_session}" \
341323
"${stdout_report_path}" \
342324
"${stderr_report_path}"; \
343325
launchable record tests \
344-
--session "$(cat "${test_spec_session_file}")" \
326+
--session "${test_spec_session}" \
345327
raw ${test_spec_report_path}/* || true; \
346328
fi
347329
if: ${{ always() && steps.enable-launchable.outputs.enable-launchable }}
@@ -352,8 +334,8 @@ runs:
352334
test_all_enabled: ${{ steps.global.outputs.test_all_enabled }}
353335
btest_enabled: ${{ steps.global.outputs.btest_enabled }}
354336
test_spec_enabled: ${{ steps.global.outputs.test_spec_enabled }}
355-
test_all_session_file: ${{ steps.global.outputs.test_all_session_file }}
356-
btest_session_file: ${{ steps.global.outputs.btest_session_file }}
357-
test_spec_session_file: ${{ steps.global.outputs.test_spec_session_file }}
337+
test_all_session: ${{ steps.setup-launchable.outputs.test_all_session }}
338+
btest_session: ${{ steps.setup-launchable.outputs.btest_session }}
339+
test_spec_session: ${{ steps.setup-launchable.outputs.test_spec_session }}
358340
stdout_report_path: ${{ steps.variables.outputs.stdout_report_path }}
359341
stderr_report_path: ${{ steps.variables.outputs.stderr_report_path }}

0 commit comments

Comments
 (0)