Skip to content

Commit decefb4

Browse files
authored
Stop resolving and building external dependencies for Python 2 (#18577)
1 parent f70bcfa commit decefb4

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

.github/workflows/build-deps.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ jobs:
145145
if: steps.changed-files.outputs.builders_any_changed == 'true' && matrix.job.image == 'linux-aarch64'
146146
run: |-
147147
sudo /home/runner/miniconda3/bin/python .builders/build.py ${{ matrix.job.image }} --python 3 ${{ env.OUT_DIR }}/py3
148-
sudo /home/runner/miniconda3/bin/python .builders/build.py ${{ matrix.job.image }} --python 2 ${{ env.OUT_DIR }}/py2
149148
# Give ownership of the output back to the user
150149
sudo chown ${USER} ${{ env.OUT_DIR }}
151150
@@ -154,20 +153,17 @@ jobs:
154153
run: |-
155154
digest=$(jq -r '.["${{ matrix.job.image }}"]' .deps/image_digests.json)
156155
sudo /home/runner/miniconda3/bin/python .builders/build.py ${{ matrix.job.image }} --python 3 ${{ env.OUT_DIR }}/py3 --digest $digest
157-
sudo /home/runner/miniconda3/bin/python .builders/build.py ${{ matrix.job.image }} --python 2 ${{ env.OUT_DIR }}/py2 --digest $digest
158156
159157
- name: Build image and wheels
160158
if: steps.changed-files.outputs.builders_any_changed == 'true' && matrix.job.image != 'linux-aarch64'
161159
run: |-
162160
python .builders/build.py ${{ matrix.job.image }} --python 3 ${{ env.OUT_DIR }}/py3
163-
python .builders/build.py ${{ matrix.job.image }} --python 2 ${{ env.OUT_DIR }}/py2
164161
165162
- name: Pull image and build wheels
166163
if: steps.changed-files.outputs.builders_any_changed != 'true' && matrix.job.image != 'linux-aarch64'
167164
run: |-
168165
digest=$(jq -r '.["${{ matrix.job.image }}"]' .deps/image_digests.json)
169166
python .builders/build.py ${{ matrix.job.image }} --python 3 ${{ env.OUT_DIR }}/py3 --digest $digest
170-
python .builders/build.py ${{ matrix.job.image }} --python 2 ${{ env.OUT_DIR }}/py2 --digest $digest
171167
172168
- name: Change permissions
173169
if: matrix.job.image == 'linux-aarch64'
@@ -205,7 +201,6 @@ jobs:
205201
TARGET_NAME: macos-x86_64
206202
OUT_DIR: output/macos-x86_64
207203
DD_PYTHON3: "/Library/Frameworks/Python.framework/Versions/3.11/bin/python"
208-
DD_PYTHON2: "/Library/Frameworks/Python.framework/Versions/2.7/bin/python"
209204

210205
steps:
211206
- name: Set up environment
@@ -219,14 +214,10 @@ jobs:
219214
env:
220215
# Despite the name, this is built for the macOS 11 SDK on arm64 and 10.9+ on intel
221216
PYTHON3_DOWNLOAD_URL: "https://www.python.org/ftp/python/3.11.5/python-3.11.5-macos11.pkg"
222-
PYTHON2_DOWNLOAD_URL: "https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg"
223217
run: |-
224218
curl "$PYTHON3_DOWNLOAD_URL" -o python3.pkg
225219
sudo installer -pkg python3.pkg -target /
226220
227-
curl "$PYTHON2_DOWNLOAD_URL" -o python2.pkg
228-
sudo installer -pkg python2.pkg -target /
229-
230221
- name: Checkout code
231222
uses: actions/checkout@v4
232223

@@ -256,8 +247,6 @@ jobs:
256247
mkdir ~/builder_root
257248
${DD_PYTHON3} .builders/build.py ${{ env.TARGET_NAME }} --builder-root ~/builder_root --python 3 ${{ env.OUT_DIR }}/py3
258249
fi
259-
# At this point we can always skip builder setup since it's equivalent for python versions
260-
${DD_PYTHON3} .builders/build.py ${{ env.TARGET_NAME }} --builder-root ~/builder_root --python 2 ${{ env.OUT_DIR }}/py2 --skip-setup
261250
262251
- name: Upload artifacts
263252
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)