Skip to content

Commit e5e7b06

Browse files
committed
Use nodemcu/espressif-sdk-archive toolchains urls for windows
1 parent 5155aa8 commit e5e7b06

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -81,27 +81,24 @@ jobs:
8181
with:
8282
submodules: true
8383

84-
- uses: msys2/setup-msys2@v2
85-
with:
86-
update: true
87-
cache: true
88-
install: >-
89-
make
90-
gcc
91-
python
92-
python-pip
93-
unzip
84+
- name: Download ESP32 MSYS2 Toolchain
85+
run: |
86+
Invoke-WebRequest -Uri "https://media.githubusercontent.com/media/nodemcu/espressif-sdk-archive/refs/heads/master/esp32_win32_msys2_environment_and_toolchain-20181001.zip" -OutFile "esp32_toolchain.zip"
9487
88+
- name: Extract Toolchain
89+
run: |
90+
Expand-Archive -Path "esp32_toolchain.zip" -DestinationPath "D:\" -Force
91+
9592
- name: Setup Python venv
96-
shell: msys2 {0}
93+
shell: D:\msys32\usr\bin\bash.exe --login {0}
9794
run: |
9895
python -m venv .venv
9996
. .venv/bin/activate
10097
python -m pip install --upgrade pip
10198
pip install pyserial
10299
103100
- name: Build firmware
104-
shell: msys2 {0}
101+
shell: D:\msys32\usr\bin\bash.exe --login {0}
105102
run: |
106103
. .venv/bin/activate
107104
@@ -118,13 +115,13 @@ jobs:
118115
fi
119116
120117
- name: Copy required DLLs
121-
shell: msys2 {0}
118+
shell: D:\msys32\usr\bin\bash.exe --login {0}
122119
run: |
123120
ldd luac.cross.exe | awk '{print $3}' | grep -vi "/c/windows" | xargs -I{} cp -v {} . || true
124121
ls *.dll
125122
126123
- name: Check build items
127-
shell: msys2 {0}
124+
shell: D:\msys32\usr\bin\bash.exe --login {0}
128125
run: |
129126
ls -ll bin/0x00000.bin bin/0x10000.bin luac.cross.exe
130127

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ ifeq ($(OS),Windows_NT)
110110
TOOLCHAIN_VERSION = 2020r3
111111
GCCTOOLCHAIN = xtensa-lx106-elf-gcc8_4_0-esp-$(TOOLCHAIN_VERSION)-win32
112112
TOOLCHAIN_ROOT = $(TOP_DIR)/tools/toolchains/esp8266-$(GCCTOOLCHAIN)
113-
ESPRESSIF_URL = https://dl.espressif.com/dl
113+
ESPRESSIF_URL = https://media.githubusercontent.com/media/nodemcu/espressif-sdk-archive/refs/heads/master
114114
TOOLCHAIN_EXT = zip
115115
TOOLCHAIN_URL = $(ESPRESSIF_URL)/$(GCCTOOLCHAIN).$(TOOLCHAIN_EXT)
116116
WGET = wget --tries=10 --timeout=15 --waitretry=30 --read-timeout=20 --retry-connrefused

0 commit comments

Comments
 (0)