@@ -145,7 +145,6 @@ jobs:
145
145
if : steps.changed-files.outputs.builders_any_changed == 'true' && matrix.job.image == 'linux-aarch64'
146
146
run : |-
147
147
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
149
148
# Give ownership of the output back to the user
150
149
sudo chown ${USER} ${{ env.OUT_DIR }}
151
150
@@ -154,20 +153,17 @@ jobs:
154
153
run : |-
155
154
digest=$(jq -r '.["${{ matrix.job.image }}"]' .deps/image_digests.json)
156
155
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
158
156
159
157
- name : Build image and wheels
160
158
if : steps.changed-files.outputs.builders_any_changed == 'true' && matrix.job.image != 'linux-aarch64'
161
159
run : |-
162
160
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
164
161
165
162
- name : Pull image and build wheels
166
163
if : steps.changed-files.outputs.builders_any_changed != 'true' && matrix.job.image != 'linux-aarch64'
167
164
run : |-
168
165
digest=$(jq -r '.["${{ matrix.job.image }}"]' .deps/image_digests.json)
169
166
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
171
167
172
168
- name : Change permissions
173
169
if : matrix.job.image == 'linux-aarch64'
@@ -205,7 +201,6 @@ jobs:
205
201
TARGET_NAME : macos-x86_64
206
202
OUT_DIR : output/macos-x86_64
207
203
DD_PYTHON3 : " /Library/Frameworks/Python.framework/Versions/3.11/bin/python"
208
- DD_PYTHON2 : " /Library/Frameworks/Python.framework/Versions/2.7/bin/python"
209
204
210
205
steps :
211
206
- name : Set up environment
@@ -219,14 +214,10 @@ jobs:
219
214
env :
220
215
# Despite the name, this is built for the macOS 11 SDK on arm64 and 10.9+ on intel
221
216
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"
223
217
run : |-
224
218
curl "$PYTHON3_DOWNLOAD_URL" -o python3.pkg
225
219
sudo installer -pkg python3.pkg -target /
226
220
227
- curl "$PYTHON2_DOWNLOAD_URL" -o python2.pkg
228
- sudo installer -pkg python2.pkg -target /
229
-
230
221
- name : Checkout code
231
222
uses : actions/checkout@v4
232
223
@@ -256,8 +247,6 @@ jobs:
256
247
mkdir ~/builder_root
257
248
${DD_PYTHON3} .builders/build.py ${{ env.TARGET_NAME }} --builder-root ~/builder_root --python 3 ${{ env.OUT_DIR }}/py3
258
249
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
261
250
262
251
- name : Upload artifacts
263
252
uses : actions/upload-artifact@v4
0 commit comments