Skip to content

Commit d38dce2

Browse files
committed
Hardcode archive name and compression/decompression commands
1 parent 3047efb commit d38dce2

File tree

2 files changed

+3
-45
lines changed

2 files changed

+3
-45
lines changed

.github/workflows/sycl-linux-precommit.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ jobs:
118118
sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
119119
sycl_toolchain_decompress_command: ${{ needs.build.outputs.artifact_decompress_command }}
120120
e2e_binaries_artifact: sycl_e2e_bin_default
121-
e2e_binaries_archive: ${{ needs.build_e2e_tests.outputs.artifact_archive_name }}
122-
e2e_binaries_decompress_command: ${{ needs.build_e2e_tests.outputs.artifact_decompress_command }}
123121

124122
test:
125123
needs: [build, detect_changes, determine_arc_tests]

.github/workflows/sycl-linux-run-tests.yml

Lines changed: 3 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,13 @@ on:
6363
type: string
6464
default: ''
6565
required: False
66-
e2e_binaries_archive:
67-
type: string
68-
default: ''
69-
required: False
70-
e2e_binaries_decompress_command:
71-
type: string
72-
default: ''
73-
required: False
7466

7567
upload_artifact:
7668
type: string
7769
default: 'false'
7870
artifact_suffix:
7971
type: string
8072
default: 'default'
81-
artifact_archive_name:
82-
type: string
83-
default: e2e_binaries.tar.zst
8473
retention-days:
8574
description: 'E2E binaries artifact retention period'
8675
type: string
@@ -105,12 +94,6 @@ on:
10594
default: 'false'
10695
required: False
10796

108-
outputs:
109-
artifact_archive_name:
110-
value: ${{ jobs.run.outputs.artifact_archive_name }}
111-
artifact_decompress_command:
112-
value: ${{ jobs.run.outputs.artifact_decompress_command }}
113-
11497
workflow_dispatch:
11598
inputs:
11699
runner:
@@ -193,30 +176,8 @@ jobs:
193176
container:
194177
image: ${{ inputs.image }}
195178
options: ${{ inputs.image_options }}
196-
outputs:
197-
artifact_archive_name: ${{ steps.artifact_info.outputs.ARCHIVE_NAME }}
198-
artifact_decompress_command: ${{ steps.artifact_info.outputs.DECOMPRESS }}
199179
env: ${{ fromJSON(inputs.env) }}
200180
steps:
201-
- name: Deduce artifact archive params
202-
if: inputs.upload_artifact == 'true'
203-
id: artifact_info
204-
run: |
205-
NAME="${{inputs.artifact_archive_name}}"
206-
if [ -z "$NAME" ]; then
207-
NAME=e2e_binaries.tar.zst
208-
fi
209-
echo ARCHIVE_NAME="$NAME" >> $GITHUB_OUTPUT
210-
if [ "${NAME}" != "${NAME%.tar.gz}" ]; then
211-
echo COMPRESS="gzip" >> $GITHUB_OUTPUT
212-
echo DECOMPRESS="gunzip" >> $GITHUB_OUTPUT
213-
elif [ "${NAME}" != "${NAME%.tar.zst}" ]; then
214-
echo COMPRESS="zstd -9" >> $GITHUB_OUTPUT
215-
echo DECOMPRESS="zstd" >> $GITHUB_OUTPUT
216-
else
217-
echo "Unsupported extension"
218-
exit 1
219-
fi
220181
- name: Reset Intel GPU
221182
if: inputs.reset_intel_gpu == 'true'
222183
run: |
@@ -340,8 +301,7 @@ jobs:
340301
if: inputs.e2e_binaries_artifact != ''
341302
run: |
342303
mkdir build-e2e
343-
tar -I '${{ inputs.e2e_binaries_decompress_command }}' -xf ${{ inputs.e2e_binaries_archive }} -C build-e2e
344-
rm -f ${{ inputs.e2e_binaries_artifact }}
304+
tar -I 'zstd' -xf e2e_binaries.tar.zst -C build-e2e
345305
346306
- name: Deduce E2E CMake options
347307
if: inputs.tests_selector == 'e2e' && inputs.e2e_binaries_artifact == ''
@@ -450,11 +410,11 @@ jobs:
450410
exit $ret
451411
- name: Pack e2e binaries
452412
if: ${{ always() && !cancelled() && inputs.upload_artifact == 'true'}}
453-
run: tar -I '${{ steps.artifact_info.outputs.COMPRESS }}' -cf ${{ steps.artifact_info.outputs.ARCHIVE_NAME }} -C ./build-e2e .
413+
run: tar -I 'zstd -9' -cf e2e_binaries.tar.zst -C ./build-e2e .
454414
- name: Upload e2e binaries
455415
if: ${{ always() && !cancelled() && inputs.upload_artifact == 'true'}}
456416
uses: actions/upload-artifact@v4
457417
with:
458418
name: sycl_e2e_bin_${{ inputs.artifact_suffix }}
459-
path: ${{ steps.artifact_info.outputs.ARCHIVE_NAME }}
419+
path: e2e_binaries.tar.zst
460420
retention-days: ${{ inputs.retention-days }}

0 commit comments

Comments
 (0)