Skip to content

Commit 8541b42

Browse files
authored
Remove manylinux2014 based builds support logic (#6491)
Removing Manylinux 204 support. The logic was added to work around Github dropping support to Manylinux 2014 workers. Workaround was added for following Github Actions: ``` actions/checkout@v4 actions/download-artifact@v3 actions/upload-artifact@v3 aws-actions/configure-aws-credentials@v3 ``` Reverting following PRs: #5941 #5968 #5971
1 parent 934a67a commit 8541b42

File tree

4 files changed

+2
-85
lines changed

4 files changed

+2
-85
lines changed

.github/actions/binary-upload/action.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

.github/actions/setup-binary-builds/action.yml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ inputs:
4040
required: false
4141
type: boolean
4242
default: no
43-
use-github-checkout:
44-
description: One of the parameter used by pkg-helpers
45-
required: false
46-
type: boolean
47-
default: true
4843

4944
runs:
5045
using: composite
@@ -58,21 +53,12 @@ runs:
5853
rm -rf "${REPOSITORY}"
5954
6055
- uses: actions/checkout@v4
61-
if: ${{ inputs.use-github-checkout == 'true' }}
6256
with:
6357
repository: ${{ inputs.repository }}
6458
ref: ${{ inputs.ref }}
6559
submodules: ${{ inputs.submodules }}
6660
path: ${{ inputs.repository }}
6761

68-
- uses: atalman/checkout-action@main
69-
if: ${{ inputs.use-github-checkout == 'false' }}
70-
with:
71-
repository: ${{ inputs.repository }}
72-
path: ${{ inputs.repository }}
73-
submodules: ${{ inputs.submodules }}
74-
ref: ${{ inputs.ref }}
75-
7662
- name: Log Available Webhook Fields
7763
shell: bash
7864
run: |
@@ -146,7 +132,7 @@ runs:
146132
export CONDA_EXTRA_PARAM=" python-freethreading -c conda-forge"
147133
148134
# downgrade conda version for python 3.13t install.
149-
# TODO: remove this once python 3.13t is fully suported on conda
135+
# TODO: remove this once python 3.13t is fully supported on conda
150136
# Please see : https://github.com/conda/conda/issues/14554
151137
if [[ "$(uname)" == Darwin ]]; then
152138
# required to be able to downgrade on MacOS arm64

.github/workflows/_binary_upload.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ jobs:
5050
matrix: ${{ fromJSON(inputs.build-matrix) }}
5151
timeout-minutes: 30
5252
name: upload-${{ matrix.build_name }}
53-
env:
54-
DO_UPLOAD: ${{ contains(matrix.validation_runner, 'windows') || contains(matrix.validation_runner, 'macos') || contains(matrix.container_image, '2_28') || contains(matrix.container_image, 'manylinuxaarch64-builder:cuda') }}
5553
steps:
5654
- uses: actions/checkout@v4
5755
with:
@@ -72,7 +70,6 @@ jobs:
7270
upload-to-base-bucket: ${{ matrix.upload_to_base_bucket }}
7371

7472
- name: Download the artifact
75-
if: ${{ env.DO_UPLOAD == 'true' }}
7673
uses: actions/download-artifact@v4
7774
with:
7875
name: ${{ env.ARTIFACT_NAME }}
@@ -100,7 +97,6 @@ jobs:
10097
echo "NIGHTLY_OR_TEST=1" >> "${GITHUB_ENV}"
10198
10299
- name: Upload package to pytorch.org
103-
if: ${{ env.DO_UPLOAD == 'true' }}
104100
shell: bash
105101
working-directory: ${{ inputs.repository }}
106102
run: |
@@ -123,7 +119,7 @@ jobs:
123119
done
124120
125121
- name: Upload package to pypi
126-
if: ${{ env.DO_UPLOAD == 'true' && env.NIGHTLY_OR_TEST == '1' && contains(inputs.upload-to-pypi, matrix.desired_cuda) }}
122+
if: ${{ env.NIGHTLY_OR_TEST == '1' && contains(inputs.upload-to-pypi, matrix.desired_cuda) }}
127123
uses: pypa/gh-action-pypi-publish@release/v1
128124
with:
129125
user: __token__

.github/workflows/build_wheels_linux.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ jobs:
127127
CU_VERSION: ${{ matrix.desired_cuda }}
128128
UPLOAD_TO_BASE_BUCKET: ${{ matrix.upload_to_base_bucket }}
129129
ARCH: ${{ inputs.architecture }}
130-
IS_MANYLINUX2_28: ${{ contains(matrix.container_image, '2_28') || contains(matrix.container_image, 'manylinuxaarch64-builder:cuda') }}
131130
BUILD_TARGET: ${{ inputs.build-target }}
132131
name: build-${{ matrix.build_name }}
133132
runs-on: ${{ matrix.validation_runner }}
@@ -151,20 +150,12 @@ jobs:
151150
echo "::endgroup::"
152151
153152
- uses: actions/checkout@v4
154-
if: ${{ env.IS_MANYLINUX2_28 == 'true' }}
155153
with:
156154
# Support the use case where we need to checkout someone's fork
157155
repository: ${{ inputs.test-infra-repository }}
158156
ref: ${{ inputs.test-infra-ref }}
159157
path: test-infra
160158

161-
- uses: atalman/checkout-action@main
162-
if: ${{ env.IS_MANYLINUX2_28 == 'false' }}
163-
with:
164-
repository: ${{ inputs.test-infra-repository }}
165-
ref: ${{ inputs.test-infra-ref }}
166-
path: test-infra
167-
168159
- name: Install Miniforge
169160
if: ${{ inputs.architecture == 'aarch64' }}
170161
shell: bash -l {0}
@@ -204,7 +195,6 @@ jobs:
204195
python-version: ${{ env.PYTHON_VERSION }}
205196
cuda-version: ${{ env.CU_VERSION }}
206197
arch: ${{ env.ARCH }}
207-
use-github-checkout: ${{ env.IS_MANYLINUX2_28 }}
208198

209199
- name: Combine Env Var and Build Env Files
210200
if: ${{ inputs.env-var-script != '' }}
@@ -299,15 +289,7 @@ jobs:
299289
fi
300290
# NB: Only upload to GitHub after passing smoke tests
301291

302-
- name: Upload wheel
303-
if: ${{ env.IS_MANYLINUX2_28 != 'true' }}
304-
uses: ./test-infra/.github/actions/binary-upload
305-
with:
306-
repository: ${{ inputs.repository }}
307-
trigger-event: ${{ inputs.trigger-event }}
308-
309292
- name: Upload wheel to GitHub
310-
if: ${{ env.IS_MANYLINUX2_28 == 'true' }}
311293
continue-on-error: true
312294
uses: actions/upload-artifact@v4
313295
with:

0 commit comments

Comments
 (0)