Skip to content
This repository was archived by the owner on Sep 10, 2025. It is now read-only.

Commit 5f77cb8

Browse files
PaliCPaliC
committed
Merge branch 'release/0.18' of github.com:pytorch/text into release/0.18
2 parents 8a30154 + 1edf1cd commit 5f77cb8

15 files changed

+89
-33
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ on:
1515

1616
jobs:
1717
generate-matrix:
18-
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
18+
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.2
1919
with:
2020
package-type: conda
2121
os: linux
2222
test-infra-repository: pytorch/test-infra
23-
test-infra-ref: main
23+
test-infra-ref: release/2.2
2424
with-cuda: disable
2525
build:
2626
needs: generate-matrix
@@ -35,13 +35,13 @@ jobs:
3535
smoke-test-script: test/smoke_tests/smoke_tests.py
3636
package-name: torchtext
3737
name: ${{ matrix.repository }}
38-
uses: pytorch/test-infra/.github/workflows/build_conda_linux.yml@main
38+
uses: pytorch/test-infra/.github/workflows/build_conda_linux.yml@release/2.2
3939
with:
4040
conda-package-directory: ${{ matrix.conda-package-directory }}
4141
repository: ${{ matrix.repository }}
4242
ref: ""
4343
test-infra-repository: pytorch/test-infra
44-
test-infra-ref: main
44+
test-infra-ref: release/2.2
4545
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
4646
pre-script: ${{ matrix.pre-script }}
4747
post-script: ${{ matrix.post-script }}
@@ -52,3 +52,4 @@ jobs:
5252
trigger-event: ${{ github.event_name }}
5353
secrets:
5454
CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }}
55+
CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ on:
1515

1616
jobs:
1717
generate-matrix:
18-
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
18+
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.2
1919
with:
2020
package-type: conda
2121
os: macos-arm64
2222
test-infra-repository: pytorch/test-infra
23-
test-infra-ref: main
23+
test-infra-ref: release/2.2
2424
build:
2525
needs: generate-matrix
2626
strategy:
@@ -34,13 +34,13 @@ jobs:
3434
smoke-test-script: test/smoke_tests/smoke_tests.py
3535
package-name: torchtext
3636
name: ${{ matrix.repository }}
37-
uses: pytorch/test-infra/.github/workflows/build_conda_macos.yml@main
37+
uses: pytorch/test-infra/.github/workflows/build_conda_macos.yml@release/2.2
3838
with:
3939
conda-package-directory: ${{ matrix.conda-package-directory }}
4040
repository: ${{ matrix.repository }}
4141
ref: ""
4242
test-infra-repository: pytorch/test-infra
43-
test-infra-ref: main
43+
test-infra-ref: release/2.2
4444
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
4545
pre-script: ${{ matrix.pre-script }}
4646
post-script: ${{ matrix.post-script }}
@@ -52,3 +52,4 @@ jobs:
5252
trigger-event: ${{ github.event_name }}
5353
secrets:
5454
CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }}
55+
CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ on:
1515

1616
jobs:
1717
generate-matrix:
18-
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
18+
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.2
1919
with:
2020
package-type: conda
2121
os: windows
2222
test-infra-repository: pytorch/test-infra
23-
test-infra-ref: main
23+
test-infra-ref: release/2.2
2424
with-cuda: disable
2525
build:
2626
needs: generate-matrix
@@ -35,13 +35,13 @@ jobs:
3535
smoke-test-script: test/smoke_tests/smoke_tests.py
3636
package-name: torchtext
3737
name: ${{ matrix.repository }}
38-
uses: pytorch/test-infra/.github/workflows/build_conda_windows.yml@main
38+
uses: pytorch/test-infra/.github/workflows/build_conda_windows.yml@release/2.2
3939
with:
4040
conda-package-directory: ${{ matrix.conda-package-directory }}
4141
repository: ${{ matrix.repository }}
4242
ref: ""
4343
test-infra-repository: pytorch/test-infra
44-
test-infra-ref: main
44+
test-infra-ref: release/2.2
4545
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
4646
pre-script: ${{ matrix.pre-script }}
4747
post-script: ${{ matrix.post-script }}
@@ -50,3 +50,4 @@ jobs:
5050
trigger-event: ${{ github.event_name }}
5151
secrets:
5252
CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }}
53+
CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }}

‎.github/workflows/build-docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
jobs:
1616
build:
17-
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
17+
uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.2
1818
with:
1919
job-name: Build doc
2020
runner: linux.2xlarge

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ permissions:
1919

2020
jobs:
2121
generate-matrix:
22-
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
22+
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.2
2323
with:
2424
package-type: wheel
2525
os: linux
2626
test-infra-repository: pytorch/test-infra
27-
test-infra-ref: main
27+
test-infra-ref: release/2.2
2828
with-cuda: disable
2929
with-rocm: disable
3030
build:
@@ -39,12 +39,12 @@ jobs:
3939
smoke-test-script: test/smoke_tests/smoke_tests.py
4040
package-name: torchtext
4141
name: ${{ matrix.repository }}
42-
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main
42+
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@release/2.2
4343
with:
4444
repository: ${{ matrix.repository }}
4545
ref: ""
4646
test-infra-repository: pytorch/test-infra
47-
test-infra-ref: main
47+
test-infra-ref: release/2.2
4848
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
4949
pre-script: ${{ matrix.pre-script }}
5050
post-script: ${{ matrix.post-script }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ permissions:
1919

2020
jobs:
2121
generate-matrix:
22-
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
22+
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.2
2323
with:
2424
package-type: wheel
2525
os: macos-arm64
2626
test-infra-repository: pytorch/test-infra
27-
test-infra-ref: main
27+
test-infra-ref: release/2.2
2828
build:
2929
needs: generate-matrix
3030
strategy:
@@ -37,12 +37,12 @@ jobs:
3737
package-name: torchtext
3838
smoke-test-script: test/smoke_tests/smoke_tests.py
3939
name: ${{ matrix.repository }}
40-
uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@main
40+
uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@release/2.2
4141
with:
4242
repository: ${{ matrix.repository }}
4343
ref: ""
4444
test-infra-repository: pytorch/test-infra
45-
test-infra-ref: main
45+
test-infra-ref: release/2.2
4646
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
4747
pre-script: ${{ matrix.pre-script }}
4848
post-script: ${{ matrix.post-script }}

‎.github/workflows/build-wheels-macos.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Build Macos Wheels
2+
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:
15+
16+
jobs:
17+
generate-matrix:
18+
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.2
19+
with:
20+
package-type: wheel
21+
os: macos
22+
test-infra-repository: pytorch/test-infra
23+
test-infra-ref: release/2.2
24+
build:
25+
needs: generate-matrix
26+
strategy:
27+
fail-fast: false
28+
matrix:
29+
include:
30+
- repository: pytorch/text
31+
pre-script: packaging/install_torchdata.sh
32+
post-script: ""
33+
package-name: torchtext
34+
smoke-test-script: test/smoke_tests/smoke_tests.py
35+
name: ${{ matrix.repository }}
36+
uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@release/2.2
37+
with:
38+
repository: ${{ matrix.repository }}
39+
ref: ""
40+
test-infra-repository: pytorch/test-infra
41+
test-infra-ref: release/2.2
42+
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
43+
pre-script: ${{ matrix.pre-script }}
44+
post-script: ${{ matrix.post-script }}
45+
package-name: ${{ matrix.package-name }}
46+
smoke-test-script: ${{ matrix.smoke-test-script }}
47+
runner-type: macos-12
48+
# Using "development" as trigger event so these binaries are not uploaded
49+
# to official channels yet
50+
trigger-event: ${{ github.event_name }}
51+
secrets:
52+
AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID: ${{ secrets.AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID }}
53+
AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY: ${{ secrets.AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ permissions:
1919

2020
jobs:
2121
generate-matrix:
22-
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
22+
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.2
2323
with:
2424
package-type: wheel
2525
os: windows
2626
test-infra-repository: pytorch/test-infra
27-
test-infra-ref: main
27+
test-infra-ref: release/2.2
2828
with-cuda: disable
2929
build:
3030
needs: generate-matrix
@@ -39,12 +39,12 @@ jobs:
3939
smoke-test-script: test/smoke_tests/smoke_tests.py
4040
package-name: torchtext
4141
name: ${{ matrix.repository }}
42-
uses: pytorch/test-infra/.github/workflows/build_wheels_windows.yml@main
42+
uses: pytorch/test-infra/.github/workflows/build_wheels_windows.yml@release/2.2
4343
with:
4444
repository: ${{ matrix.repository }}
4545
ref: ""
4646
test-infra-repository: pytorch/test-infra
47-
test-infra-ref: main
47+
test-infra-ref: release/2.2
4848
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
4949
pre-script: ${{ matrix.pre-script }}
5050
env-script: ${{ matrix.env-script }}

‎.github/workflows/integration-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
matrix:
1313
python_version: ["3.8"]
1414
fail-fast: false
15-
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
15+
uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.2
1616
with:
1717
runner: linux.12xlarge
1818
repository: pytorch/text

‎.github/workflows/lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
jobs:
1313
python-source-and-configs:
14-
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
14+
uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.2
1515
with:
1616
repository: pytorch/text
1717
script: |
@@ -41,7 +41,7 @@ jobs:
4141
echo '::endgroup::'
4242
4343
c-source:
44-
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
44+
uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.2
4545
with:
4646
repository: pytorch/text
4747
script: |

0 commit comments

Comments
 (0)