Skip to content

Commit d436178

Browse files
NicolasHugNicolasHug
committed
Put back normal CI
1 parent fc15059 commit d436178

File tree

9 files changed

+479
-480
lines changed

9 files changed

+479
-480
lines changed

‎.github/scripts/unittest.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ echo '::endgroup::'
1515
python test/smoke_test.py
1616

1717
# We explicitly ignore the video tests until we resolve https://github.com/pytorch/vision/issues/8162
18-
# pytest --ignore-glob="*test_video*" --junit-xml="${RUNNER_TEST_RESULTS_DIR}/test-results.xml" -v --durations=25
19-
pytest --ignore-glob="*test_video*" --junit-xml="${RUNNER_TEST_RESULTS_DIR}/test-results.xml" -v --durations=25 test/test_image.py
18+
pytest --ignore-glob="*test_video*" --junit-xml="${RUNNER_TEST_RESULTS_DIR}/test-results.xml" -v --durations=25

‎.github/workflows/build-conda-linux.yml‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
1-
# name: Build Linux Conda
1+
name: Build Linux Conda
22

3-
# on:
4-
# pull_request:
5-
# push:
6-
# branches:
7-
# - nightly
8-
# - main
9-
# - release/*
10-
# tags:
11-
# # NOTE: Binary build pipelines should only get triggered on release candidate builds
12-
# # Release candidate tags look like: v1.11.0-rc1
13-
# - v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+
14-
# workflow_dispatch:
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- nightly
8+
- main
9+
- release/*
10+
tags:
11+
# NOTE: Binary build pipelines should only get triggered on release candidate builds
12+
# Release candidate tags look like: v1.11.0-rc1
13+
- v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+
14+
workflow_dispatch:
1515

16-
# jobs:
17-
# generate-matrix:
18-
# uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
19-
# with:
20-
# package-type: conda
21-
# os: linux
22-
# test-infra-repository: pytorch/test-infra
23-
# test-infra-ref: main
24-
# build:
25-
# needs: generate-matrix
26-
# strategy:
27-
# fail-fast: false
28-
# matrix:
29-
# include:
30-
# - repository: pytorch/vision
31-
# pre-script: ""
32-
# post-script: ""
33-
# conda-package-directory: packaging/torchvision
34-
# smoke-test-script: test/smoke_test.py
35-
# package-name: torchvision
36-
# name: ${{ matrix.repository }}
37-
# uses: pytorch/test-infra/.github/workflows/build_conda_linux.yml@main
38-
# with:
39-
# conda-package-directory: ${{ matrix.conda-package-directory }}
40-
# repository: ${{ matrix.repository }}
41-
# ref: ""
42-
# test-infra-repository: pytorch/test-infra
43-
# test-infra-ref: main
44-
# build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
45-
# pre-script: ${{ matrix.pre-script }}
46-
# post-script: ${{ matrix.post-script }}
47-
# package-name: ${{ matrix.package-name }}
48-
# smoke-test-script: ${{ matrix.smoke-test-script }}
49-
# trigger-event: ${{ github.event_name }}
50-
# secrets:
51-
# CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }}
52-
# CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }}
16+
jobs:
17+
generate-matrix:
18+
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
19+
with:
20+
package-type: conda
21+
os: linux
22+
test-infra-repository: pytorch/test-infra
23+
test-infra-ref: main
24+
build:
25+
needs: generate-matrix
26+
strategy:
27+
fail-fast: false
28+
matrix:
29+
include:
30+
- repository: pytorch/vision
31+
pre-script: ""
32+
post-script: ""
33+
conda-package-directory: packaging/torchvision
34+
smoke-test-script: test/smoke_test.py
35+
package-name: torchvision
36+
name: ${{ matrix.repository }}
37+
uses: pytorch/test-infra/.github/workflows/build_conda_linux.yml@main
38+
with:
39+
conda-package-directory: ${{ matrix.conda-package-directory }}
40+
repository: ${{ matrix.repository }}
41+
ref: ""
42+
test-infra-repository: pytorch/test-infra
43+
test-infra-ref: main
44+
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
45+
pre-script: ${{ matrix.pre-script }}
46+
post-script: ${{ matrix.post-script }}
47+
package-name: ${{ matrix.package-name }}
48+
smoke-test-script: ${{ matrix.smoke-test-script }}
49+
trigger-event: ${{ github.event_name }}
50+
secrets:
51+
CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }}
52+
CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }}

‎.github/workflows/build-conda-m1.yml‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
1-
# name: Build M1 Conda
1+
name: Build M1 Conda
22

3-
# on:
4-
# pull_request:
5-
# push:
6-
# branches:
7-
# - nightly
8-
# - main
9-
# - release/*
10-
# tags:
11-
# # NOTE: Binary build pipelines should only get triggered on release candidate builds
12-
# # Release candidate tags look like: v1.11.0-rc1
13-
# - v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+
14-
# workflow_dispatch:
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- nightly
8+
- main
9+
- release/*
10+
tags:
11+
# NOTE: Binary build pipelines should only get triggered on release candidate builds
12+
# Release candidate tags look like: v1.11.0-rc1
13+
- v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+
14+
workflow_dispatch:
1515

16-
# jobs:
17-
# generate-matrix:
18-
# uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
19-
# with:
20-
# package-type: conda
21-
# os: macos-arm64
22-
# test-infra-repository: pytorch/test-infra
23-
# test-infra-ref: main
24-
# build:
25-
# needs: generate-matrix
26-
# strategy:
27-
# fail-fast: false
28-
# matrix:
29-
# include:
30-
# - repository: pytorch/vision
31-
# pre-script: ""
32-
# post-script: ""
33-
# conda-package-directory: packaging/torchvision
34-
# smoke-test-script: test/smoke_test.py
35-
# package-name: torchvision
36-
# name: ${{ matrix.repository }}
37-
# uses: pytorch/test-infra/.github/workflows/build_conda_macos.yml@main
38-
# with:
39-
# conda-package-directory: ${{ matrix.conda-package-directory }}
40-
# repository: ${{ matrix.repository }}
41-
# ref: ""
42-
# test-infra-repository: pytorch/test-infra
43-
# test-infra-ref: main
44-
# build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
45-
# env-var-script: ./.github/scripts/export_IS_M1_CONDA_BUILD_JOB.sh
46-
# pre-script: ${{ matrix.pre-script }}
47-
# post-script: ${{ matrix.post-script }}
48-
# package-name: ${{ matrix.package-name }}
49-
# smoke-test-script: ${{ matrix.smoke-test-script }}
50-
# runner-type: macos-m1-stable
51-
# trigger-event: ${{ github.event_name }}
52-
# secrets:
53-
# CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }}
54-
# CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }}
16+
jobs:
17+
generate-matrix:
18+
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
19+
with:
20+
package-type: conda
21+
os: macos-arm64
22+
test-infra-repository: pytorch/test-infra
23+
test-infra-ref: main
24+
build:
25+
needs: generate-matrix
26+
strategy:
27+
fail-fast: false
28+
matrix:
29+
include:
30+
- repository: pytorch/vision
31+
pre-script: ""
32+
post-script: ""
33+
conda-package-directory: packaging/torchvision
34+
smoke-test-script: test/smoke_test.py
35+
package-name: torchvision
36+
name: ${{ matrix.repository }}
37+
uses: pytorch/test-infra/.github/workflows/build_conda_macos.yml@main
38+
with:
39+
conda-package-directory: ${{ matrix.conda-package-directory }}
40+
repository: ${{ matrix.repository }}
41+
ref: ""
42+
test-infra-repository: pytorch/test-infra
43+
test-infra-ref: main
44+
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
45+
env-var-script: ./.github/scripts/export_IS_M1_CONDA_BUILD_JOB.sh
46+
pre-script: ${{ matrix.pre-script }}
47+
post-script: ${{ matrix.post-script }}
48+
package-name: ${{ matrix.package-name }}
49+
smoke-test-script: ${{ matrix.smoke-test-script }}
50+
runner-type: macos-m1-stable
51+
trigger-event: ${{ github.event_name }}
52+
secrets:
53+
CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }}
54+
CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }}

‎.github/workflows/build-conda-windows.yml‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
1-
# name: Build Windows Conda
1+
name: Build Windows Conda
22

3-
# on:
4-
# pull_request:
5-
# push:
6-
# branches:
7-
# - nightly
8-
# - main
9-
# - release/*
10-
# tags:
11-
# # NOTE: Binary build pipelines should only get triggered on release candidate builds
12-
# # Release candidate tags look like: v1.11.0-rc1
13-
# - v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+
14-
# workflow_dispatch:
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- nightly
8+
- main
9+
- release/*
10+
tags:
11+
# NOTE: Binary build pipelines should only get triggered on release candidate builds
12+
# Release candidate tags look like: v1.11.0-rc1
13+
- v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+
14+
workflow_dispatch:
1515

16-
# jobs:
17-
# generate-matrix:
18-
# uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
19-
# with:
20-
# package-type: conda
21-
# os: windows
22-
# test-infra-repository: pytorch/test-infra
23-
# test-infra-ref: main
24-
# build:
25-
# needs: generate-matrix
26-
# strategy:
27-
# fail-fast: false
28-
# matrix:
29-
# include:
30-
# - repository: pytorch/vision
31-
# pre-script: ""
32-
# post-script: ""
33-
# env-script: packaging/windows/internal/vc_env_helper.bat
34-
# conda-package-directory: packaging/torchvision
35-
# smoke-test-script: test/smoke_test.py
36-
# package-name: torchvision
37-
# name: ${{ matrix.repository }}
38-
# uses: pytorch/test-infra/.github/workflows/build_conda_windows.yml@main
39-
# with:
40-
# conda-package-directory: ${{ matrix.conda-package-directory }}
41-
# repository: ${{ matrix.repository }}
42-
# ref: ""
43-
# test-infra-repository: pytorch/test-infra
44-
# test-infra-ref: main
45-
# build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
46-
# pre-script: ${{ matrix.pre-script }}
47-
# post-script: ${{ matrix.post-script }}
48-
# package-name: ${{ matrix.package-name }}
49-
# smoke-test-script: ${{ matrix.smoke-test-script }}
50-
# trigger-event: ${{ github.event_name }}
51-
# secrets:
52-
# CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }}
53-
# CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }}
16+
jobs:
17+
generate-matrix:
18+
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
19+
with:
20+
package-type: conda
21+
os: windows
22+
test-infra-repository: pytorch/test-infra
23+
test-infra-ref: main
24+
build:
25+
needs: generate-matrix
26+
strategy:
27+
fail-fast: false
28+
matrix:
29+
include:
30+
- repository: pytorch/vision
31+
pre-script: ""
32+
post-script: ""
33+
env-script: packaging/windows/internal/vc_env_helper.bat
34+
conda-package-directory: packaging/torchvision
35+
smoke-test-script: test/smoke_test.py
36+
package-name: torchvision
37+
name: ${{ matrix.repository }}
38+
uses: pytorch/test-infra/.github/workflows/build_conda_windows.yml@main
39+
with:
40+
conda-package-directory: ${{ matrix.conda-package-directory }}
41+
repository: ${{ matrix.repository }}
42+
ref: ""
43+
test-infra-repository: pytorch/test-infra
44+
test-infra-ref: main
45+
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
46+
pre-script: ${{ matrix.pre-script }}
47+
post-script: ${{ matrix.post-script }}
48+
package-name: ${{ matrix.package-name }}
49+
smoke-test-script: ${{ matrix.smoke-test-script }}
50+
trigger-event: ${{ github.event_name }}
51+
secrets:
52+
CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }}
53+
CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }}

0 commit comments

Comments
 (0)