Skip to content

Commit

Permalink
[fbsync] Revert "Use @release/2.5 instead of @main for CI jobs" (#8645)
Browse files Browse the repository at this point in the history
Reviewed By: vmoens

Differential Revision: D62581686

fbshipit-source-id: a3dec2b7d358419d72c4954d28ce3359a54635ac
  • Loading branch information
NicolasHug authored and facebook-github-bot committed Sep 13, 2024
1 parent aacb3e4 commit 9e5fd10
Show file tree
Hide file tree
Showing 13 changed files with 58 additions and 58 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build-cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ jobs:
gpu-arch-type: cuda
gpu-arch-version: "11.8"
fail-fast: false
uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
with:
repository: pytorch/vision
runner: ${{ matrix.runner }}
gpu-arch-type: ${{ matrix.gpu-arch-type }}
gpu-arch-version: ${{ matrix.gpu-arch-version }}
test-infra-ref: release/2.5
test-infra-ref: main
script: |
set -euo pipefail
Expand All @@ -42,11 +42,11 @@ jobs:
include:
- runner: macos-m1-stable
fail-fast: false
uses: pytorch/test-infra/.github/workflows/macos_job.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
with:
repository: pytorch/vision
runner: ${{ matrix.runner }}
test-infra-ref: release/2.5
test-infra-ref: main
script: |
set -euo pipefail
Expand All @@ -66,13 +66,13 @@ jobs:
gpu-arch-type: cuda
gpu-arch-version: "11.8"
fail-fast: false
uses: pytorch/test-infra/.github/workflows/windows_job.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/windows_job.yml@main
with:
repository: pytorch/vision
runner: ${{ matrix.runner }}
gpu-arch-type: ${{ matrix.gpu-arch-type }}
gpu-arch-version: ${{ matrix.gpu-arch-version }}
test-infra-ref: release/2.5
test-infra-ref: main
script: |
set -euo pipefail
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-conda-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ on:

jobs:
generate-matrix:
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
with:
package-type: conda
os: linux
test-infra-repository: pytorch/test-infra
test-infra-ref: release/2.5
test-infra-ref: main
build:
needs: generate-matrix
strategy:
Expand All @@ -34,13 +34,13 @@ jobs:
smoke-test-script: test/smoke_test.py
package-name: torchvision
name: ${{ matrix.repository }}
uses: pytorch/test-infra/.github/workflows/build_conda_linux.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/build_conda_linux.yml@main
with:
conda-package-directory: ${{ matrix.conda-package-directory }}
repository: ${{ matrix.repository }}
ref: ""
test-infra-repository: pytorch/test-infra
test-infra-ref: release/2.5
test-infra-ref: main
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
pre-script: ${{ matrix.pre-script }}
post-script: ${{ matrix.post-script }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-conda-m1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ on:

jobs:
generate-matrix:
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
with:
package-type: conda
os: macos-arm64
test-infra-repository: pytorch/test-infra
test-infra-ref: release/2.5
test-infra-ref: main
build:
needs: generate-matrix
strategy:
Expand All @@ -34,13 +34,13 @@ jobs:
smoke-test-script: test/smoke_test.py
package-name: torchvision
name: ${{ matrix.repository }}
uses: pytorch/test-infra/.github/workflows/build_conda_macos.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/build_conda_macos.yml@main
with:
conda-package-directory: ${{ matrix.conda-package-directory }}
repository: ${{ matrix.repository }}
ref: ""
test-infra-repository: pytorch/test-infra
test-infra-ref: release/2.5
test-infra-ref: main
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
env-var-script: ./.github/scripts/export_IS_M1_CONDA_BUILD_JOB.sh
pre-script: ${{ matrix.pre-script }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-conda-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ on:

jobs:
generate-matrix:
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
with:
package-type: conda
os: windows
test-infra-repository: pytorch/test-infra
test-infra-ref: release/2.5
test-infra-ref: main
build:
needs: generate-matrix
strategy:
Expand All @@ -35,13 +35,13 @@ jobs:
smoke-test-script: test/smoke_test.py
package-name: torchvision
name: ${{ matrix.repository }}
uses: pytorch/test-infra/.github/workflows/build_conda_windows.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/build_conda_windows.yml@main
with:
conda-package-directory: ${{ matrix.conda-package-directory }}
repository: ${{ matrix.repository }}
ref: ""
test-infra-repository: pytorch/test-infra
test-infra-ref: release/2.5
test-infra-ref: main
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
pre-script: ${{ matrix.pre-script }}
post-script: ${{ matrix.post-script }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-wheels-aarch64-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ permissions:

jobs:
generate-matrix:
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
with:
package-type: wheel
os: linux-aarch64
test-infra-repository: pytorch/test-infra
test-infra-ref: release/2.5
test-infra-ref: main
with-cuda: disable
build:
needs: generate-matrix
Expand All @@ -38,12 +38,12 @@ jobs:
smoke-test-script: test/smoke_test.py
package-name: torchvision
name: ${{ matrix.repository }}
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main
with:
repository: ${{ matrix.repository }}
ref: ""
test-infra-repository: pytorch/test-infra
test-infra-ref: release/2.5
test-infra-ref: main
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
pre-script: ${{ matrix.pre-script }}
post-script: ${{ matrix.post-script }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-wheels-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ permissions:

jobs:
generate-matrix:
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
with:
package-type: wheel
os: linux
test-infra-repository: pytorch/test-infra
test-infra-ref: release/2.5
test-infra-ref: main
with-xpu: enable
build:
needs: generate-matrix
Expand All @@ -38,12 +38,12 @@ jobs:
smoke-test-script: test/smoke_test.py
package-name: torchvision
name: ${{ matrix.repository }}
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main
with:
repository: ${{ matrix.repository }}
ref: ""
test-infra-repository: pytorch/test-infra
test-infra-ref: release/2.5
test-infra-ref: main
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
pre-script: ${{ matrix.pre-script }}
post-script: ${{ matrix.post-script }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-wheels-m1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ permissions:

jobs:
generate-matrix:
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
with:
package-type: wheel
os: macos-arm64
test-infra-repository: pytorch/test-infra
test-infra-ref: release/2.5
test-infra-ref: main
build:
needs: generate-matrix
strategy:
Expand All @@ -37,12 +37,12 @@ jobs:
smoke-test-script: test/smoke_test.py
package-name: torchvision
name: ${{ matrix.repository }}
uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@main
with:
repository: ${{ matrix.repository }}
ref: ""
test-infra-repository: pytorch/test-infra
test-infra-ref: release/2.5
test-infra-ref: main
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
pre-script: ${{ matrix.pre-script }}
post-script: ${{ matrix.post-script }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-wheels-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ permissions:

jobs:
generate-matrix:
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
with:
package-type: wheel
os: windows
test-infra-repository: pytorch/test-infra
test-infra-ref: release/2.5
test-infra-ref: main
build:
needs: generate-matrix
strategy:
Expand All @@ -38,12 +38,12 @@ jobs:
smoke-test-script: test/smoke_test.py
package-name: torchvision
name: ${{ matrix.repository }}
uses: pytorch/test-infra/.github/workflows/build_wheels_windows.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/build_wheels_windows.yml@main
with:
repository: ${{ matrix.repository }}
ref: ""
test-infra-repository: pytorch/test-infra
test-infra-ref: release/2.5
test-infra-ref: main
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
pre-script: ${{ matrix.pre-script }}
env-script: ${{ matrix.env-script }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ on:

jobs:
build:
uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
with:
repository: pytorch/vision
upload-artifact: docs
test-infra-ref: release/2.5
test-infra-ref: main
script: |
set -euo pipefail
Expand Down Expand Up @@ -81,12 +81,12 @@ jobs:
((github.ref_type == 'branch' && github.ref_name == 'main') || github.ref_type == 'tag')
permissions:
contents: write
uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
with:
repository: pytorch/vision
download-artifact: docs
ref: gh-pages
test-infra-ref: release/2.5
test-infra-ref: main
script: |
set -euo pipefail
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ on:

jobs:
python-source-and-configs:
uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
with:
repository: pytorch/vision
test-infra-ref: release/2.5
test-infra-ref: main
script: |
set -euo pipefail
Expand All @@ -38,10 +38,10 @@ jobs:
fi
c-source:
uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
with:
repository: pytorch/vision
test-infra-ref: release/2.5
test-infra-ref: main
script: |
set -euo pipefail
Expand All @@ -65,10 +65,10 @@ jobs:
python-types:
uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
with:
repository: pytorch/vision
test-infra-ref: release/2.5
test-infra-ref: main
script: |
set -euo pipefail
Expand All @@ -95,7 +95,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Run BC Lint Action
uses: pytorch/test-infra/.github/actions/bc-lint@release/2.5
uses: pytorch/test-infra/.github/actions/bc-lint@main
with:
repo: ${{ github.event.pull_request.head.repo.full_name }}
base_sha: ${{ github.event.pull_request.base.sha }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prototype-tests-linux-gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
gpu-arch-type: cuda
gpu-arch-version: "11.8"
fail-fast: false
uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.5
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
with:
repository: pytorch/vision
runner: ${{ matrix.runner }}
Expand Down
Loading

0 comments on commit 9e5fd10

Please sign in to comment.