Skip to content

Commit c23ef8e

Browse files
committed
chore(ci): hoist R2 env vars to job level in fuzz workflows
The R2 credentials (AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_REGION, AWS_ENDPOINT_URL) were duplicated across restore/persist steps in run-fuzzer.yml (2x), minimize_fuzz_corpus_workflow.yml (2x), and fuzz-coverage.yml (1x). Move them to job-level env blocks. Signed-off-by: Alexander Droste <alex@spiraldb.com> Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Alexander Droste <alexander.droste@protonmail.com>
1 parent 773c54d commit c23ef8e

3 files changed

Lines changed: 14 additions & 25 deletions

File tree

.github/workflows/fuzz-coverage.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ env:
1111
jobs:
1212
coverage:
1313
name: "Coverage: ${{ matrix.fuzz_target }}"
14+
env:
15+
AWS_ACCESS_KEY_ID: ${{ secrets.R2_FUZZ_ACCESS_KEY_ID }}
16+
AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_FUZZ_SECRET_ACCESS_KEY }}
17+
AWS_REGION: "us-east-1"
18+
AWS_ENDPOINT_URL: "https://01e9655179bbec953276890b183039bc.r2.cloudflarestorage.com"
1419
strategy:
1520
fail-fast: false
1621
matrix:
@@ -56,11 +61,6 @@ jobs:
5661

5762
- name: Download corpus from R2
5863
shell: bash
59-
env:
60-
AWS_ACCESS_KEY_ID: ${{ secrets.R2_FUZZ_ACCESS_KEY_ID }}
61-
AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_FUZZ_SECRET_ACCESS_KEY }}
62-
AWS_REGION: "us-east-1"
63-
AWS_ENDPOINT_URL: "https://01e9655179bbec953276890b183039bc.r2.cloudflarestorage.com"
6464
run: |
6565
CORPUS_KEY="${{ matrix.fuzz_target }}_corpus.tar.zst"
6666
CORPUS_DIR="fuzz/corpus/${{ matrix.fuzz_target }}"

.github/workflows/minimize_fuzz_corpus_workflow.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ env:
3434
jobs:
3535
minimize:
3636
name: "Minimize ${{ inputs.fuzz_target }}"
37+
env:
38+
AWS_ACCESS_KEY_ID: ${{ secrets.R2_FUZZ_ACCESS_KEY_ID }}
39+
AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_FUZZ_SECRET_ACCESS_KEY }}
40+
AWS_REGION: "us-east-1"
41+
AWS_ENDPOINT_URL: "https://01e9655179bbec953276890b183039bc.r2.cloudflarestorage.com"
3742
runs-on: >-
3843
${{ github.repository == 'vortex-data/vortex'
3944
&& format('runs-on={0}/runner=arm64-medium/disk=large/tag={1}-minimize', github.run_id, inputs.fuzz_target)
@@ -64,11 +69,6 @@ jobs:
6469

6570
- name: Restore corpus
6671
shell: bash
67-
env:
68-
AWS_ACCESS_KEY_ID: ${{ secrets.R2_FUZZ_ACCESS_KEY_ID }}
69-
AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_FUZZ_SECRET_ACCESS_KEY }}
70-
AWS_REGION: "us-east-1"
71-
AWS_ENDPOINT_URL: "https://01e9655179bbec953276890b183039bc.r2.cloudflarestorage.com"
7272
run: |
7373
CORPUS_KEY="${{ inputs.fuzz_target }}_corpus.tar.zst"
7474
CORPUS_DIR="fuzz/corpus/${{ inputs.fuzz_target }}"
@@ -98,11 +98,6 @@ jobs:
9898
9999
- name: Persist corpus
100100
shell: bash
101-
env:
102-
AWS_ACCESS_KEY_ID: ${{ secrets.R2_FUZZ_ACCESS_KEY_ID }}
103-
AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_FUZZ_SECRET_ACCESS_KEY }}
104-
AWS_REGION: "us-east-1"
105-
AWS_ENDPOINT_URL: "https://01e9655179bbec953276890b183039bc.r2.cloudflarestorage.com"
106101
run: |
107102
CORPUS_KEY="${{ inputs.fuzz_target }}_corpus.tar.zst"
108103
CORPUS_DIR="fuzz/corpus/${{ inputs.fuzz_target }}"

.github/workflows/run-fuzzer.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ jobs:
6161
name: "Run ${{ inputs.fuzz_name || inputs.fuzz_target }}"
6262
env:
6363
FUZZ_NAME: ${{ inputs.fuzz_name || inputs.fuzz_target }}
64+
AWS_ACCESS_KEY_ID: ${{ secrets.R2_FUZZ_ACCESS_KEY_ID }}
65+
AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_FUZZ_SECRET_ACCESS_KEY }}
66+
AWS_REGION: "us-east-1"
67+
AWS_ENDPOINT_URL: "https://01e9655179bbec953276890b183039bc.r2.cloudflarestorage.com"
6468
timeout-minutes: 230 # almost 4 hours
6569
runs-on: >-
6670
${{ github.repository == 'vortex-data/vortex'
@@ -95,11 +99,6 @@ jobs:
9599

96100
- name: Restore corpus
97101
shell: bash
98-
env:
99-
AWS_ACCESS_KEY_ID: ${{ secrets.R2_FUZZ_ACCESS_KEY_ID }}
100-
AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_FUZZ_SECRET_ACCESS_KEY }}
101-
AWS_REGION: "us-east-1"
102-
AWS_ENDPOINT_URL: "https://01e9655179bbec953276890b183039bc.r2.cloudflarestorage.com"
103102
run: |
104103
CORPUS_KEY="${FUZZ_NAME}_corpus.tar.zst"
105104
CORPUS_DIR="fuzz/corpus/${FUZZ_NAME}"
@@ -189,11 +188,6 @@ jobs:
189188

190189
- name: Persist corpus
191190
shell: bash
192-
env:
193-
AWS_ACCESS_KEY_ID: ${{ secrets.R2_FUZZ_ACCESS_KEY_ID }}
194-
AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_FUZZ_SECRET_ACCESS_KEY }}
195-
AWS_REGION: "us-east-1"
196-
AWS_ENDPOINT_URL: "https://01e9655179bbec953276890b183039bc.r2.cloudflarestorage.com"
197191
run: |
198192
CORPUS_KEY="${FUZZ_NAME}_corpus.tar.zst"
199193
CORPUS_DIR="fuzz/corpus/${FUZZ_NAME}"

0 commit comments

Comments
 (0)