Skip to content

Commit e1e34ea

Browse files
authored
chore: upgrade missed e2e upload artifact to v4 (#1937)
1 parent 9f06d68 commit e1e34ea

File tree

2 files changed

+24
-10
lines changed

2 files changed

+24
-10
lines changed

.github/workflows/acceptance_test.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ concurrency:
2222
jobs:
2323
fail_if_pull_request_is_draft: # Fails in order to indicate that pull request needs to be marked as ready to review to pass.
2424
if: github.event.pull_request.draft == true
25-
runs-on: ubuntu-latest
25+
runs-on: ubuntu-22.04
2626
steps:
2727
- name: Fail if PR is a draft
2828
run: exit 1
2929
pre_ci:
3030
name: Prepare CI environment
3131
if: github.event.pull_request.draft == false # Skip this job and its dependencies if the PR is draft
32-
runs-on: ubuntu-latest
32+
runs-on: ubuntu-22.04
3333
steps:
3434
- name: Checkout Project
3535
uses: actions/checkout@v4
@@ -53,13 +53,13 @@ jobs:
5353
validate-gradle-wrapper:
5454
if: "!contains(needs.pre_ci.outputs.commit_message, '[acceptance test skip]')"
5555
needs: pre_ci
56-
runs-on: ubuntu-latest
56+
runs-on: ubuntu-22.04
5757
steps:
5858
- uses: actions/checkout@v4
5959
- uses: gradle/actions/wrapper-validation@v3
6060
pack-snapshot:
6161
needs: [ validate-gradle-wrapper ]
62-
runs-on: ubuntu-latest
62+
runs-on: ubuntu-22.04
6363
steps:
6464
- uses: actions/checkout@v4
6565
- name: Set up JDK 11
@@ -89,7 +89,7 @@ jobs:
8989
path: output-comparator/build/libs/output-comparator-*-cli.jar
9090
pack-master:
9191
needs: [ validate-gradle-wrapper ]
92-
runs-on: ubuntu-latest
92+
runs-on: ubuntu-22.04
9393
steps:
9494
- uses: actions/checkout@v4
9595
with:
@@ -117,7 +117,7 @@ jobs:
117117
fetch-urls:
118118
if: "!contains(needs.pre_ci.outputs.commit_message, '[acceptance test skip]')"
119119
needs: pre_ci
120-
runs-on: ubuntu-latest
120+
runs-on: ubuntu-22.04
121121
steps:
122122
- name: Checkout repository code
123123
uses: actions/checkout@v4
@@ -174,7 +174,7 @@ jobs:
174174
name: reports_${{ env.CONCATENATED_IDS }}
175175
path: ${{ github.sha }}/output
176176
merge-reports-artifacts:
177-
runs-on: ubuntu-latest
177+
runs-on: ubuntu-22.04
178178
needs: [ get-reports ]
179179
steps:
180180
- name: Merge Artifacts
@@ -185,7 +185,7 @@ jobs:
185185
delete-merged: true
186186
compare-outputs:
187187
needs: [ merge-reports-artifacts ]
188-
runs-on: ubuntu-latest
188+
runs-on: ubuntu-22.04
189189
steps:
190190
- uses: actions/checkout@v4
191191
- name: Download comparator .jar file from previous job

.github/workflows/end_to_end.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ on:
3131
- 'acceptance_test.yml'
3232
- 'web/**'
3333
- '.github/workflows/**'
34+
workflow_dispatch:
3435
jobs:
3536
validate_gradle_wrapper:
3637
runs-on: ubuntu-latest
@@ -104,8 +105,21 @@ jobs:
104105
bash ./scripts/queue_runner.sh --exclude-master $queue
105106
env:
106107
OUTPUT_BASE: ${{ github.sha }}
108+
- name: Extract ID from JSON
109+
id: extract-id
110+
run: echo "feed_id=$(echo '${{ matrix.data }}' | jq -r '.id')" >> $GITHUB_ENV
107111
- name: Persist reports
108-
uses: actions/upload-artifact@v3
112+
uses: actions/upload-artifact@v4
109113
with:
110-
name: reports_snapshot
114+
name: reports_snapshot_${{ env.feed_id }}
111115
path: ${{ github.sha }}/output
116+
merge-reports-artifacts:
117+
runs-on: ubuntu-latest
118+
needs: [ run-on-data ]
119+
steps:
120+
- name: Merge Artifacts
121+
uses: actions/upload-artifact/merge@v4
122+
with:
123+
name: reports_snapshot
124+
pattern: reports_snapshot_*
125+
delete-merged: true

0 commit comments

Comments
 (0)