Skip to content

Commit 6230927

Browse files
ptheywoodmondus
authored andcommitted
CI: install setuptools and wheel for py>=3.12 in Manylinux_2_28 and DraftRelease
1 parent 4053052 commit 6230927

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

.github/workflows/Draft-Release.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,6 @@ jobs:
371371
FLAMEGPU_SEATBELTS: ${{ matrix.config.SEATBELTS }}
372372
PYTHON: ${{ matrix.python}}
373373
VISUALISATION: ${{ matrix.VISUALISATION }}
374-
# Short term fix to use node16 not node20 for actions. This will stop working eventually, forcing our hand in dropping manylinux2014 support.
375-
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
376374

377375
steps:
378376
- uses: actions/checkout@v4
@@ -430,6 +428,11 @@ jobs:
430428
- name: Add custom problem matchers for annotations
431429
run: echo "::add-matcher::.github/problem-matchers.json"
432430

431+
- name: Install setuptools and wheel
432+
if: ${{ env.PYTHON >= 3.12 }}
433+
run: |
434+
python${{env.PYTHON}} -m pip install setuptools wheel
435+
433436
# This patches a bug where ManyLinux doesn't generate buildnumber as git dir is owned by diff user
434437
- name: Enable git safe-directory
435438
run: git config --global --add safe.directory $GITHUB_WORKSPACE

.github/workflows/Manylinux_2_28.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ jobs:
7777
FLAMEGPU_SEATBELTS: ${{ matrix.config.SEATBELTS }}
7878
PYTHON: ${{ matrix.python}}
7979
VISUALISATION: ${{ matrix.VISUALISATION }}
80-
# Short term fix to use node16 not node20 for actions. This will stop working eventually, forcing our hand in dropping manylinux2014 support.
81-
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
8280

8381
steps:
8482
- uses: actions/checkout@v4
@@ -137,6 +135,11 @@ jobs:
137135
- name: Add custom problem matchers for annotations
138136
run: echo "::add-matcher::.github/problem-matchers.json"
139137

138+
- name: Install setuptools and wheel
139+
if: ${{ env.PYTHON >= 3.12 }}
140+
run: |
141+
python${{env.PYTHON}} -m pip install setuptools wheel
142+
140143
# This patches a bug where ManyLinux doesn't generate buildnumber as git dir is owned by diff user
141144
- name: Enable git safe-directory
142145
run: git config --global --add safe.directory $GITHUB_WORKSPACE

0 commit comments

Comments
 (0)