File tree Expand file tree Collapse file tree 2 files changed +12
-15
lines changed Expand file tree Collapse file tree 2 files changed +12
-15
lines changed Original file line number Diff line number Diff line change @@ -80,27 +80,24 @@ jobs:
8080 with :
8181 submodules : true
8282
83- - uses : msys2/setup-msys2@v2
84- with :
85- update : true
86- cache : true
87- install : >-
88- make
89- gcc
90- python
91- python-pip
92- unzip
83+ - name : Download ESP32 MSYS2 Toolchain
84+ run : |
85+ 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"
9386
87+ - name : Extract Toolchain
88+ run : |
89+ Expand-Archive -Path "esp32_toolchain.zip" -DestinationPath "D:\" -Force
90+
9491 - name : Setup Python venv
95- shell : msys2 {0}
92+ shell : D:\msys32\usr\bin\bash.exe --login {0}
9693 run : |
9794 python -m venv .venv
9895 . .venv/bin/activate
9996 python -m pip install --upgrade pip
10097 pip install pyserial
10198
10299 - name : Build firmware
103- shell : msys2 {0}
100+ shell : D:\msys32\usr\bin\bash.exe --login {0}
104101 run : |
105102 . .venv/bin/activate
106103
@@ -117,13 +114,13 @@ jobs:
117114 fi
118115
119116 - name : Copy required DLLs
120- shell : msys2 {0}
117+ shell : D:\msys32\usr\bin\bash.exe --login {0}
121118 run : |
122119 ldd luac.cross.exe | awk '{print $3}' | grep -vi "/c/windows" | xargs -I{} cp -v {} . || true
123120 ls *.dll
124121
125122 - name : Check build items
126- shell : msys2 {0}
123+ shell : D:\msys32\usr\bin\bash.exe --login {0}
127124 run : |
128125 ls -ll bin/0x00000.bin bin/0x10000.bin luac.cross.exe
129126
Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments