Skip to content

Commit c983925

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

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

Diff for: .github/scripts/install-arduino-core-esp32.sh

+5-1
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'"

Diff for: .github/workflows/build_py_tools.yml

+3-8
Original file line numberDiff line numberDiff line change
@@ -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 }}
@@ -89,11 +85,10 @@ jobs:
8985
- name: Checkout repository
9086
uses: actions/checkout@v4
9187
with:
92-
token: ${{ secrets.TOOLS_UPLOAD_PAT }}
9388
ref: ${{ github.event.pull_request.head.ref }}
9489
- name: Set up Python 3.8
9590
# 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'
91+
if: matrix.os != 'ARM'
9792
uses: actions/setup-python@master
9893
with:
9994
python-version: 3.8
@@ -108,7 +103,7 @@ jobs:
108103
pyinstaller --distpath ./${{ env.DISTPATH }} -F --icon=.github/pytools/espressif.ico tools/$tool.py
109104
done
110105
- name: Sign binaries
111-
if: matrix.os == 'windows-latest' && env.CERTIFICATE != '' && env.CERTIFICATE_PASSWORD != ''
106+
if: matrix.os == 'windows-latest'
112107
env:
113108
CERTIFICATE: ${{ secrets.CERTIFICATE }}
114109
CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}

0 commit comments

Comments
 (0)