Skip to content

Commit 8a85f50

Browse files
authored
Test version validations (#1603)
* test * test
1 parent 6e1fc13 commit 8a85f50

6 files changed

+76
-36
lines changed

.github/workflows/validate-aarch64-linux-binaries.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ on:
2222
default: ""
2323
required: false
2424
type: string
25+
release-matrix:
26+
description: 'Release matrix - optional'
27+
default: ""
28+
required: false
29+
type: string
2530
workflow_dispatch:
2631
inputs:
2732
channel:
@@ -48,6 +53,11 @@ on:
4853
default: ""
4954
required: false
5055
type: string
56+
release-matrix:
57+
description: 'Release matrix - optional'
58+
default: ""
59+
required: false
60+
type: string
5161

5262
jobs:
5363
generate-aarch64-linux-matrix:
@@ -57,12 +67,8 @@ jobs:
5767
os: linux-aarch64
5868
channel: ${{ inputs.channel }}
5969
with-cuda: disable
60-
generate-release-matrix:
61-
uses: pytorch/test-infra/.github/workflows/generate_release_matrix.yml@main
62-
with:
63-
version: ${{ inputs.version }}
6470
linux-aarch64:
65-
needs: [generate-aarch64-linux-matrix, generate-release-matrix]
71+
needs: generate-aarch64-linux-matrix
6672
strategy:
6773
matrix: ${{ fromJson(needs.generate-aarch64-linux-matrix.outputs.matrix) }}
6874
fail-fast: false
@@ -86,7 +92,7 @@ jobs:
8692
export TARGET_OS="linux-aarch64"
8793
export TORCH_ONLY=${{ inputs.torchonly }}
8894
export RELEASE_VERSION=${{ inputs.version }}
89-
printf '%s\n' ${{ toJson(needs.generate-release-matrix.outputs.matrix) }} > release_matrix.json
95+
printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json
9096
eval "$(conda shell.bash hook)"
9197
9298
# Standart case: Validate binaries

.github/workflows/validate-binaries.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,54 +61,69 @@ on:
6161
required: false
6262
type: boolean
6363
version:
64-
description: 'Version to validate - optional'
64+
description: 'Version to validate'
6565
default: ""
6666
required: false
6767
type: string
6868

6969

7070
jobs:
71+
generate-release-matrix:
72+
uses: pytorch/test-infra/.github/workflows/generate_release_matrix.yml@main
73+
with:
74+
version: ${{ inputs.version }}
75+
7176
win:
7277
if: inputs.os == 'windows' || inputs.os == 'all'
78+
needs: generate-release-matrix
7379
uses: ./.github/workflows/validate-windows-binaries.yml
7480
with:
7581
channel: ${{ inputs.channel }}
7682
ref: ${{ inputs.ref || github.ref }}
7783
torchonly: ${{ inputs.torchonly }}
7884
version: ${{ inputs.version }}
85+
release-matrix: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix) }}
7986

8087
linux:
8188
if: inputs.os == 'linux' || inputs.os == 'all'
89+
needs: generate-release-matrix
8290
uses: ./.github/workflows/validate-linux-binaries.yml
8391
with:
8492
channel: ${{ inputs.channel }}
8593
ref: ${{ inputs.ref || github.ref }}
8694
torchonly: ${{ inputs.torchonly }}
8795
version: ${{ inputs.version }}
96+
release-matrix: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix) }}
8897

8998
linux-aarch64:
9099
if: inputs.os == 'linux-aarch64'
100+
needs: generate-release-matrix
91101
uses: ./.github/workflows/validate-aarch64-linux-binaries.yml
92102
with:
93103
channel: ${{ inputs.channel }}
94104
ref: ${{ inputs.ref || github.ref }}
95105
torchonly: ${{ inputs.torchonly }}
96106
version: ${{ inputs.version }}
107+
release-matrix: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix) }}
97108

98109
mac:
99110
if: inputs.os == 'macos' || inputs.os == 'all'
111+
needs: generate-release-matrix
100112
uses: ./.github/workflows/validate-macos-binaries.yml
101113
with:
102114
channel: ${{ inputs.channel }}
103115
ref: ${{ inputs.ref || github.ref }}
104116
torchonly: ${{ inputs.torchonly }}
105117
version: ${{ inputs.version }}
118+
release-matrix: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix) }}
106119

107120
mac-arm64:
108121
if: inputs.os == 'macos' || inputs.os == 'all'
122+
needs: generate-release-matrix
109123
uses: ./.github/workflows/validate-macos-arm64-binaries.yml
110124
with:
111125
channel: ${{ inputs.channel }}
112126
ref: ${{ inputs.ref || github.ref }}
113127
torchonly: ${{ inputs.torchonly }}
114128
version: ${{ inputs.version }}
129+
release-matrix: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix) }}

.github/workflows/validate-linux-binaries.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ on:
2222
default: ""
2323
required: false
2424
type: string
25+
release-matrix:
26+
description: 'Release matrix - optional'
27+
default: ""
28+
required: false
29+
type: string
2530
workflow_dispatch:
2631
inputs:
2732
channel:
@@ -48,7 +53,11 @@ on:
4853
default: ""
4954
required: false
5055
type: string
51-
56+
release-matrix:
57+
description: 'Release matrix - optional'
58+
default: ""
59+
required: false
60+
type: string
5261

5362
jobs:
5463
generate-linux-matrix:
@@ -57,14 +66,9 @@ jobs:
5766
package-type: all
5867
os: linux
5968
channel: ${{ inputs.channel }}
60-
generate-release-matrix:
61-
needs: generate-linux-matrix
62-
uses: pytorch/test-infra/.github/workflows/generate_release_matrix.yml@main
63-
with:
64-
version: ${{ inputs.version }}
6569

6670
linux:
67-
needs: [generate-linux-matrix, generate-release-matrix]
71+
needs: generate-linux-matrix
6872
strategy:
6973
matrix: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix) }}
7074
fail-fast: false
@@ -83,7 +87,7 @@ jobs:
8387
export RELEASE_VERSION=${{ inputs.version }}
8488
export TARGET_OS="linux"
8589
eval "$(conda shell.bash hook)"
86-
printf '%s\n' ${{ toJson(needs.generate-release-matrix.outputs.matrix) }} > release_matrix.json
90+
printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json
8791
8892
# Special case PyPi installation package. And Install of PyPi package via poetry
8993
if [[ ${MATRIX_PACKAGE_TYPE} == "manywheel" && ${MATRIX_GPU_ARCH_VERSION} == "12.1" ]]; then

.github/workflows/validate-macos-arm64-binaries.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ on:
2222
default: ""
2323
required: false
2424
type: string
25+
release-matrix:
26+
description: 'Release matrix - optional'
27+
default: ""
28+
required: false
29+
type: string
2530
workflow_dispatch:
2631
inputs:
2732
channel:
@@ -48,6 +53,11 @@ on:
4853
default: ""
4954
required: false
5055
type: string
56+
release-matrix:
57+
description: 'Release matrix - optional'
58+
default: ""
59+
required: false
60+
type: string
5161

5262
jobs:
5363
generate-macos-arm64-matrix:
@@ -56,13 +66,8 @@ jobs:
5666
package-type: all
5767
os: macos-arm64
5868
channel: ${{ inputs.channel }}
59-
generate-release-matrix:
60-
needs: generate-macos-arm64-matrix
61-
uses: pytorch/test-infra/.github/workflows/generate_release_matrix.yml@main
62-
with:
63-
version: ${{ inputs.version }}
6469
macos-arm64:
65-
needs: [generate-macos-arm64-matrix, generate-release-matrix]
70+
needs: generate-macos-arm64-matrix
6671
strategy:
6772
matrix: ${{ fromJson(needs.generate-macos-arm64-matrix.outputs.matrix) }}
6873
fail-fast: false
@@ -80,5 +85,5 @@ jobs:
8085
export TARGET_OS="macos-arm64"
8186
export TORCH_ONLY=${{ inputs.torchonly }}
8287
export RELEASE_VERSION=${{ inputs.version }}
83-
printf '%s\n' ${{ toJson(needs.generate-release-matrix.outputs.matrix) }} > release_matrix.json
88+
printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json
8489
source ./.github/scripts/validate_binaries.sh

.github/workflows/validate-macos-binaries.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ on:
2222
default: ""
2323
required: false
2424
type: string
25+
release-matrix:
26+
description: 'Release matrix - optional'
27+
default: ""
28+
required: false
29+
type: string
2530
workflow_dispatch:
2631
inputs:
2732
channel:
@@ -48,6 +53,11 @@ on:
4853
default: ""
4954
required: false
5055
type: string
56+
release-matrix:
57+
description: 'Release matrix - optional'
58+
default: ""
59+
required: false
60+
type: string
5161

5262
jobs:
5363
generate-macos-matrix:
@@ -56,13 +66,8 @@ jobs:
5666
package-type: all
5767
os: macos
5868
channel: ${{ inputs.channel }}
59-
generate-release-matrix:
60-
needs: generate-macos-matrix
61-
uses: pytorch/test-infra/.github/workflows/generate_release_matrix.yml@main
62-
with:
63-
version: ${{ inputs.version }}
6469
macos:
65-
needs: [generate-macos-matrix, generate-release-matrix]
70+
needs: generate-macos-matrix
6671
strategy:
6772
matrix: ${{ fromJson(needs.generate-macos-matrix.outputs.matrix) }}
6873
fail-fast: false
@@ -80,5 +85,5 @@ jobs:
8085
export TARGET_OS="macos"
8186
export TORCH_ONLY=${{ inputs.torchonly }}
8287
export RELEASE_VERSION=${{ inputs.version }}
83-
printf '%s\n' ${{ toJson(needs.generate-release-matrix.outputs.matrix) }} > release_matrix.json
88+
printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json
8489
source ./.github/scripts/validate_binaries.sh

.github/workflows/validate-windows-binaries.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ on:
2222
default: ""
2323
required: false
2424
type: string
25+
release-matrix:
26+
description: 'Release matrix - optional'
27+
default: ""
28+
required: false
29+
type: string
2530
workflow_dispatch:
2631
inputs:
2732
channel:
@@ -48,6 +53,11 @@ on:
4853
default: ""
4954
required: false
5055
type: string
56+
release-matrix:
57+
description: 'Release matrix - optional'
58+
default: ""
59+
required: false
60+
type: string
5161

5262
jobs:
5363
generate-windows-matrix:
@@ -56,13 +66,8 @@ jobs:
5666
package-type: all
5767
os: windows
5868
channel: ${{ inputs.channel }}
59-
generate-release-matrix:
60-
needs: generate-windows-matrix
61-
uses: pytorch/test-infra/.github/workflows/generate_release_matrix.yml@main
62-
with:
63-
version: ${{ inputs.version }}
6469
win:
65-
needs: [generate-windows-matrix, generate-release-matrix]
70+
needs: generate-windows-matrix
6671
strategy:
6772
matrix: ${{ fromJson(needs.generate-windows-matrix.outputs.matrix) }}
6873
fail-fast: false
@@ -81,7 +86,7 @@ jobs:
8186
export TARGET_OS="windows"
8287
export TORCH_ONLY=${{ inputs.torchonly }}
8388
export RELEASE_VERSION=${{ inputs.version }}
84-
printf '%s\n' ${{ toJson(needs.generate-release-matrix.outputs.matrix) }} > release_matrix.json
89+
printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json
8590
source /c/Jenkins/Miniconda3/etc/profile.d/conda.sh
8691
if [[ ${MATRIX_GPU_ARCH_VERSION} == "12.1" ]]; then
8792
./windows/internal/driver_update.bat

0 commit comments

Comments
 (0)