Skip to content

Commit f926db1

Browse files
committed
ci(tools): Remove ARM64 and use get.exe
1 parent fa89bfb commit f926db1

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

.github/scripts/install-arduino-core-esp32.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ if [ ! -d "$ARDUINO_ESP32_PATH" ]; then
2828
#git submodule update --init --recursive > /dev/null 2>&1
2929

3030
echo "Installing Platform Tools ..."
31-
cd tools && python get.py
31+
if [ "$OS_IS_WINDOWS" == "1" ]; then
32+
cd tools && ./get.exe
33+
else
34+
cd tools && python get.py
35+
fi
3236
cd $script_init_path
3337

3438
echo "ESP32 Arduino has been installed in '$ARDUINO_ESP32_PATH'"

.github/workflows/build_py_tools.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: actions/checkout@v4
2121
with:
2222
fetch-depth: 2
23-
ref: ${{ github.event.pull_request.head.ref }}
23+
repository: ${{ github.event.pull_request.head.repo.full_name }}
2424
- name: Verify Python Tools Changed
2525
uses: tj-actions/changed-files@v41
2626
id: verify-changed-files
@@ -47,7 +47,7 @@ jobs:
4747
strategy:
4848
fail-fast: false
4949
matrix:
50-
os: [windows-latest, macos-latest, ubuntu-20.04, ARM, ARM64]
50+
os: [windows-latest, macos-latest, ubuntu-20.04, ARM]
5151
include:
5252
- os: windows-latest
5353
TARGET: win64
@@ -63,10 +63,6 @@ jobs:
6363
CONTAINER: python:3.8-bullseye
6464
TARGET: arm
6565
SEPARATOR: ':'
66-
- os: ARM64
67-
CONTAINER: python:3.8-bullseye
68-
TARGET: arm64
69-
SEPARATOR: ':'
7066
container: ${{ matrix.CONTAINER }} # use python container on ARM
7167
env:
7268
DISTPATH: pytools-${{ matrix.TARGET }}
@@ -88,13 +84,14 @@ jobs:
8884
done
8985
- name: Checkout repository
9086
uses: actions/checkout@v4
87+
env:
88+
TOKEN: ${{ secrets.GITHUB_TOKEN }}
9189
with:
92-
token: ${{ secrets.TOOLS_UPLOAD_PAT }}
93-
ref: ${{ github.event.pull_request.head.ref }}
90+
token: ${{ env.TOKEN }}
9491
- name: Set up Python 3.8
9592
# Skip setting python on ARM because of missing compatibility: https://github.com/actions/setup-python/issues/108
96-
if: matrix.os != 'ARM' && matrix.os != 'ARM64'
97-
uses: actions/setup-python@master
93+
if: matrix.os != 'ARM'
94+
uses: actions/setup-python@v5
9895
with:
9996
python-version: 3.8
10097
- name: Install dependencies

0 commit comments

Comments
 (0)