Skip to content

Commit fb31487

Browse files
committed
Revert "Add binary r2 upload step to Windows and MacOS wheel workflows (pytorch#7455)"
This reverts commit e616cec.
1 parent 4a86e34 commit fb31487

3 files changed

Lines changed: 4 additions & 60 deletions

File tree

.github/workflows/build_wheels_macos.yml

Lines changed: 0 additions & 27 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
@@ -116,7 +106,6 @@ jobs:
116106
CU_VERSION: ${{ matrix.desired_cuda }}
117107
name: build-${{ matrix.build_name }}
118108
runs-on: ${{ inputs.runner-type }}
119-
environment: ${{(inputs.trigger-event == 'schedule' || (inputs.trigger-event == 'push' && (startsWith(github.event.ref, 'refs/heads/nightly') || startsWith(github.event.ref, 'refs/tags/v')))) && 'pytorchbot-env' || ''}}
120109
# If a build is taking longer than 60 minutes on these runners we need
121110
# to have a conversation
122111
timeout-minutes: ${{ inputs.timeout }}
@@ -284,22 +273,6 @@ jobs:
284273
build-matrix: ${{ inputs.build-matrix }}
285274
trigger-event: ${{ inputs.trigger-event }}
286275

287-
upload-r2:
288-
needs: build
289-
uses: ./.github/workflows/_binary_upload_r2.yml
290-
if: always()
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-
303276
concurrency:
304277
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ inputs.repository }}-${{ github.event_name == 'workflow_dispatch' }}
305278
cancel-in-progress: true

.github/workflows/build_wheels_windows.yml

Lines changed: 1 addition & 29 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
@@ -111,7 +101,6 @@ jobs:
111101
UPLOAD_TO_BASE_BUCKET: ${{ matrix.upload_to_base_bucket }}
112102
name: build-${{ matrix.build_name }}
113103
runs-on: ${{ matrix.validation_runner }}
114-
environment: ${{(inputs.trigger-event == 'schedule' || (inputs.trigger-event == 'push' && (startsWith(github.event.ref, 'refs/heads/nightly') || startsWith(github.event.ref, 'refs/tags/v')))) && 'pytorchbot-env' || ''}}
115104
defaults:
116105
run:
117106
shell: bash -l {0}
@@ -402,23 +391,6 @@ jobs:
402391
trigger-event: ${{ inputs.trigger-event }}
403392
architecture: ${{ inputs.architecture }}
404393

405-
upload-r2:
406-
needs: build
407-
uses: ./.github/workflows/_binary_upload_r2.yml
408-
if: always()
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-
422394
concurrency:
423395
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ inputs.repository }}-${{ github.event_name == 'workflow_dispatch' }}
424-
cancel-in-progress: true
396+
cancel-in-progress: true

.lintrunner.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,9 @@ init_command = [
8181
'types-colorama==0.4.6',
8282
'filelock==3.18.0',
8383
'junitparser==2.1.1',
84-
'pytest==8.4.2',
85-
'rich==14.1.0',
86-
'pyyaml==6.0.3',
87-
'optree==0.17.0',
84+
'rich==10.9.0',
85+
'pyyaml==6.0.1',
86+
'optree==0.13.0',
8887
]
8988

9089
[[linter]]

0 commit comments

Comments
 (0)