Skip to content

Commit 357a25b

Browse files
authored
Merge branch 'candidate' into users/nileshnegi/add-version
2 parents b10a3a6 + e21806e commit 357a25b

2 files changed

Lines changed: 14 additions & 10 deletions

File tree

.github/workflows/build-relocatable-packages.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Build Relocatable Packages
22

33
on:
44
push:
5-
branches: [develop, mainline, 'release/**', candidate]
5+
branches: [candidate, develop, mainline, 'release/**']
66
pull_request:
7-
branches: [develop, mainline]
7+
branches: [candidate, develop, mainline]
88
schedule:
99
# Daily at 13:00 UTC (5:00 AM PST)
1010
- cron: '0 13 * * *'
@@ -74,7 +74,8 @@ jobs:
7474
dpkg-deb -c "${deb}" | head -50
7575
done
7676
77-
- name: Upload artifacts (always, for inspection)
77+
- name: Upload artifacts
78+
if: github.ref_name != 'candidate' && github.base_ref != 'candidate'
7879
uses: actions/upload-artifact@v4
7980
with:
8081
name: ubuntu-22.04-packages
@@ -84,14 +85,14 @@ jobs:
8485
if-no-files-found: error
8586

8687
- name: Configure AWS credentials (OIDC)
87-
if: github.repository == 'ROCm/TransferBench' && vars.AWS_S3_BUCKET != ''
88+
if: github.repository == 'ROCm/TransferBench' && vars.AWS_S3_BUCKET != '' && github.ref_name != 'candidate' && github.base_ref != 'candidate'
8889
uses: aws-actions/configure-aws-credentials@v4
8990
with:
9091
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
9192
aws-region: us-east-1
9293

9394
- name: Upload to S3
94-
if: github.repository == 'ROCm/TransferBench' && vars.AWS_S3_BUCKET != ''
95+
if: github.repository == 'ROCm/TransferBench' && vars.AWS_S3_BUCKET != '' && github.ref_name != 'candidate' && github.base_ref != 'candidate'
9596
env:
9697
AWS_S3_BUCKET: ${{ vars.AWS_S3_BUCKET }}
9798
run: |
@@ -183,7 +184,8 @@ jobs:
183184
rpm -qlp "${rpm}" | head -50
184185
done
185186
186-
- name: Upload artifacts (always, for inspection)
187+
- name: Upload artifacts
188+
if: github.ref_name != 'candidate' && github.base_ref != 'candidate'
187189
uses: actions/upload-artifact@v4
188190
with:
189191
name: manylinux_2_28-packages
@@ -193,20 +195,20 @@ jobs:
193195
if-no-files-found: error
194196

195197
- name: Install AWS CLI
196-
if: github.repository == 'ROCm/TransferBench' && vars.AWS_S3_BUCKET != ''
198+
if: github.repository == 'ROCm/TransferBench' && vars.AWS_S3_BUCKET != '' && github.ref_name != 'candidate' && github.base_ref != 'candidate'
197199
run: |
198200
curl -fsSL "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o /tmp/awscli.zip
199201
(cd /tmp && unzip -q awscli.zip && ./aws/install)
200202
201203
- name: Configure AWS credentials (OIDC)
202-
if: github.repository == 'ROCm/TransferBench' && vars.AWS_S3_BUCKET != ''
204+
if: github.repository == 'ROCm/TransferBench' && vars.AWS_S3_BUCKET != '' && github.ref_name != 'candidate' && github.base_ref != 'candidate'
203205
uses: aws-actions/configure-aws-credentials@v4
204206
with:
205207
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
206208
aws-region: us-east-1
207209

208210
- name: Upload to S3
209-
if: github.repository == 'ROCm/TransferBench' && vars.AWS_S3_BUCKET != ''
211+
if: github.repository == 'ROCm/TransferBench' && vars.AWS_S3_BUCKET != '' && github.ref_name != 'candidate' && github.base_ref != 'candidate'
210212
env:
211213
AWS_S3_BUCKET: ${{ vars.AWS_S3_BUCKET }}
212214
run: |
@@ -295,6 +297,7 @@ jobs:
295297
cat report/build-report.md >> "$GITHUB_STEP_SUMMARY"
296298
297299
- name: Upload report
300+
if: github.ref_name != 'candidate' && github.base_ref != 'candidate'
298301
uses: actions/upload-artifact@v4
299302
with:
300303
name: build-report

.github/workflows/codeql.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ name: "CodeQL Security Scanning"
33
on:
44
push:
55
branches:
6+
- candidate
67
- develop
78
- mainline
8-
- candidate
99
pull_request:
1010
branches:
11+
- candidate
1112
- develop
1213
- mainline
1314
schedule:

0 commit comments

Comments
 (0)