Skip to content

Commit 4a21b8e

Browse files
authored
Revert "Add binary r2 upload step to linux job (#7440)" (#7558)
Removing R2 dual upload step
1 parent 7a94246 commit 4a21b8e

3 files changed

Lines changed: 0 additions & 83 deletions

File tree

.github/workflows/build_wheels_linux.yml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -126,16 +126,6 @@ on:
126126
PYPI_API_TOKEN:
127127
description: An optional token to upload to pypi
128128
required: false
129-
R2_ACCOUNT_ID:
130-
description: Cloudflare R2 account ID
131-
required: false
132-
R2_ACCESS_KEY_ID:
133-
description: Cloudflare R2 access key ID
134-
required: false
135-
R2_SECRET_ACCESS_KEY:
136-
description: Cloudflare R2 secret access key
137-
required: false
138-
139129

140130
permissions:
141131
id-token: write
@@ -351,26 +341,6 @@ jobs:
351341
secrets:
352342
PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
353343

354-
upload-r2:
355-
needs: build
356-
uses: ./.github/workflows/_binary_upload_r2.yml
357-
if: false
358-
with:
359-
repository: ${{ inputs.repository }}
360-
ref: ${{ inputs.ref }}
361-
test-infra-repository: ${{ inputs.test-infra-repository }}
362-
test-infra-ref: ${{ inputs.test-infra-ref }}
363-
build-matrix: ${{ inputs.build-matrix }}
364-
architecture: ${{ inputs.architecture }}
365-
trigger-event: ${{ inputs.trigger-event }}
366-
upload-to-pypi: ${{ inputs.upload-to-pypi }}
367-
wheel-upload-path: ${{ inputs.wheel-upload-path }}
368-
wheel-nightly-policy: ${{ inputs.wheel-nightly-policy }}
369-
secrets:
370-
R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
371-
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
372-
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
373-
374344
concurrency:
375345
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ inputs.repository }}-${{ github.event_name == 'workflow_dispatch' }}
376346
cancel-in-progress: true

.github/workflows/build_wheels_macos.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,6 @@ on:
8888
description: 'Timeout for the job (in minutes)'
8989
default: 60
9090
type: number
91-
secrets:
92-
R2_ACCOUNT_ID:
93-
description: Cloudflare R2 account ID
94-
required: false
95-
R2_ACCESS_KEY_ID:
96-
description: Cloudflare R2 access key ID
97-
required: false
98-
R2_SECRET_ACCESS_KEY:
99-
description: Cloudflare R2 secret access key
100-
required: false
10191

10292
permissions:
10393
id-token: write
@@ -284,22 +274,6 @@ jobs:
284274
build-matrix: ${{ inputs.build-matrix }}
285275
trigger-event: ${{ inputs.trigger-event }}
286276

287-
upload-r2:
288-
needs: build
289-
uses: ./.github/workflows/_binary_upload_r2.yml
290-
if: false
291-
with:
292-
repository: ${{ inputs.repository }}
293-
ref: ${{ inputs.ref }}
294-
test-infra-repository: ${{ inputs.test-infra-repository }}
295-
test-infra-ref: ${{ inputs.test-infra-ref }}
296-
build-matrix: ${{ inputs.build-matrix }}
297-
trigger-event: ${{ inputs.trigger-event }}
298-
secrets:
299-
R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
300-
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
301-
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
302-
303277
concurrency:
304278
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ inputs.repository }}-${{ github.event_name == 'workflow_dispatch' }}
305279
cancel-in-progress: true

.github/workflows/build_wheels_windows.yml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,6 @@ on:
8282
description: 'CPU architecture to build for'
8383
default: "x64"
8484
type: string
85-
secrets:
86-
R2_ACCOUNT_ID:
87-
description: Cloudflare R2 account ID
88-
required: false
89-
R2_ACCESS_KEY_ID:
90-
description: Cloudflare R2 access key ID
91-
required: false
92-
R2_SECRET_ACCESS_KEY:
93-
description: Cloudflare R2 secret access key
94-
required: false
9585

9686
permissions:
9787
id-token: write
@@ -402,23 +392,6 @@ jobs:
402392
trigger-event: ${{ inputs.trigger-event }}
403393
architecture: ${{ inputs.architecture }}
404394

405-
upload-r2:
406-
needs: build
407-
uses: ./.github/workflows/_binary_upload_r2.yml
408-
if: false
409-
with:
410-
repository: ${{ inputs.repository }}
411-
ref: ${{ inputs.ref }}
412-
test-infra-repository: ${{ inputs.test-infra-repository }}
413-
test-infra-ref: ${{ inputs.test-infra-ref }}
414-
build-matrix: ${{ inputs.build-matrix }}
415-
trigger-event: ${{ inputs.trigger-event }}
416-
architecture: ${{ inputs.architecture }}
417-
secrets:
418-
R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
419-
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
420-
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
421-
422395
concurrency:
423396
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ inputs.repository }}-${{ github.event_name == 'workflow_dispatch' }}
424397
cancel-in-progress: true

0 commit comments

Comments
 (0)