From 22ebbd17dce922fa9e8b8157e55def95fdef3312 Mon Sep 17 00:00:00 2001 From: Harshil Patel Date: Thu, 25 Jul 2024 10:51:29 -0700 Subject: [PATCH 1/3] misc,test: Revert "Third attempt at fixing Daily test" This reverts commit 7722f84d1e5a45228d359800ea4566896c4ecd43. --- .github/workflows/daily-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/daily-tests.yaml b/.github/workflows/daily-tests.yaml index 6fbf18c6f5..dac0f93674 100644 --- a/.github/workflows/daily-tests.yaml +++ b/.github/workflows/daily-tests.yaml @@ -94,7 +94,7 @@ jobs: - working-directory: ${{ github.workspace }}/tests id: artifact-targets run: | - echo "targets=$(./main.py list --build-targets -q --length=long gem5/${{ matrix.test-type }} | rev | cut -d / -f 2 | rev | while read x; do echo ${{ needs.name-artifacts.outputs.build-name }}-${x}; done)" >>$GITHUB_OUTPUT + echo "targets=$(./main.py list --build-targets -q --length=long gem5/${{ matrix.test-type }} | rev | cut -d / -f 2 | rev | while read x; do echo ${ needs.name-artifacts.outputs.build-name }}-${x}; done)" >>$GITHUB_OUTPUT # Download the build artifacts for the test. - uses: actions/download-artifact@v4 From bb2fd841119c1a5161ac0bd00a0ab60c25b92ec4 Mon Sep 17 00:00:00 2001 From: Harshil Patel Date: Thu, 25 Jul 2024 10:52:24 -0700 Subject: [PATCH 2/3] misc,tests: Revert "Second attempt at fixing Daily test (#1373)" This reverts commit e7d1c90aeb5097ea3c70ffc3f25dbede663f98b4. Change-Id: I5aed0c59d55c20b1774abcaa6396f6dcad11699b --- .github/workflows/daily-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/daily-tests.yaml b/.github/workflows/daily-tests.yaml index dac0f93674..021ce89f8d 100644 --- a/.github/workflows/daily-tests.yaml +++ b/.github/workflows/daily-tests.yaml @@ -94,7 +94,7 @@ jobs: - working-directory: ${{ github.workspace }}/tests id: artifact-targets run: | - echo "targets=$(./main.py list --build-targets -q --length=long gem5/${{ matrix.test-type }} | rev | cut -d / -f 2 | rev | while read x; do echo ${ needs.name-artifacts.outputs.build-name }}-${x}; done)" >>$GITHUB_OUTPUT + echo "targets=$(/main.py list --build-targets -q --length=long gem5/${{ matrix.test-type }} | rev | cut -d / -f 2 | rev | while read x; do echo "${ needs.name-artifacts.outputs.build-name }}-${x}"; done)" >>$GITHUB_OUTPUT # Download the build artifacts for the test. - uses: actions/download-artifact@v4 From 99aa8307b69bcd2dd094c5720aec72101f4b1ef8 Mon Sep 17 00:00:00 2001 From: Harshil Patel Date: Thu, 25 Jul 2024 10:52:52 -0700 Subject: [PATCH 3/3] misc,tests: Revert "Attempt fix daily downloads (#1369)" This reverts commit 97f6f3c4dafec239258be82a0e8d6eb23b741ec7. Change-Id: I406c0c3d5429266da5ca037999247e21f1859ce5 --- .github/workflows/daily-tests.yaml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/daily-tests.yaml b/.github/workflows/daily-tests.yaml index 021ce89f8d..6ebdd5e8bd 100644 --- a/.github/workflows/daily-tests.yaml +++ b/.github/workflows/daily-tests.yaml @@ -89,18 +89,12 @@ jobs: - name: Clean runner run: rm -rf ./* || true rm -rf ./.??* || true rm -rf ~/.cache || true - uses: actions/checkout@v4 - - # Determine the build targets for the test. - - working-directory: ${{ github.workspace }}/tests - id: artifact-targets - run: | - echo "targets=$(/main.py list --build-targets -q --length=long gem5/${{ matrix.test-type }} | rev | cut -d / -f 2 | rev | while read x; do echo "${ needs.name-artifacts.outputs.build-name }}-${x}"; done)" >>$GITHUB_OUTPUT - - # Download the build artifacts for the test. + # download all artifacts for each test. Thoguh this is inelegant, + # it's simpler than figuring otu which long tests requires which + # binary. - uses: actions/download-artifact@v4 with: - pattern: | - ${{ steps.artifact-targets.outputs.targets }} + pattern: ${{needs.name-artifacts.outputs.build-name}}* merge-multiple: true # The upload/download GitHub actions do not preserve the executable # bit of the files. We need to set the executable bit for the