Skip to content

Commit 4e2cdc8

Browse files
caiohamamurausuario
authored andcommitted
Use nodemcu/espressif-sdk-archive toolchains urls for windows
1 parent 86d6041 commit 4e2cdc8

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
@@ -84,27 +84,24 @@ jobs:
8484
with:
8585
submodules: true
8686

87-
- uses: msys2/setup-msys2@v2
88-
with:
89-
update: true
90-
cache: true
91-
install: >-
92-
make
93-
gcc
94-
python
95-
python-pip
96-
unzip
87+
- name: Download ESP32 MSYS2 Toolchain
88+
run: |
89+
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"
9790
91+
- name: Extract Toolchain
92+
run: |
93+
Expand-Archive -Path "esp32_toolchain.zip" -DestinationPath "D:\" -Force
94+
9895
- name: Setup Python venv
99-
shell: msys2 {0}
96+
shell: D:\msys32\usr\bin\bash.exe --login {0}
10097
run: |
10198
python -m venv .venv
10299
. .venv/bin/activate
103100
python -m pip install --upgrade pip
104101
pip install pyserial
105102
106103
- name: Build firmware
107-
shell: msys2 {0}
104+
shell: D:\msys32\usr\bin\bash.exe --login {0}
108105
run: |
109106
. .venv/bin/activate
110107
@@ -121,13 +118,13 @@ jobs:
121118
fi
122119
123120
- name: Copy required DLLs
124-
shell: msys2 {0}
121+
shell: D:\msys32\usr\bin\bash.exe --login {0}
125122
run: |
126123
ldd luac.cross.exe | awk '{print $3}' | grep -vi "/c/windows" | xargs -I{} cp -v {} . || true
127124
ls *.dll
128125
129126
- name: Check build items
130-
shell: msys2 {0}
127+
shell: D:\msys32\usr\bin\bash.exe --login {0}
131128
run: |
132129
ls -ll bin/0x00000.bin bin/0x10000.bin luac.cross.exe
133130

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)