Skip to content

Commit ab2cb3e

Browse files
committed
Fix nightly version due to rust-lang/rust#95924
1 parent 15538b2 commit ab2cb3e

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

.github/workflows/esp-idf-tags.yml

+4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
ESP_IDF_VER=v4.4
3333
ESP_IDF_BRANCH=release/v4.4
3434
ESP_BOARD=all
35+
NIGHTLY_VERSION=nightly-2022-03-30
3536
context: .
3637
platforms: linux/amd64, linux/arm64
3738
push: true
@@ -47,6 +48,7 @@ jobs:
4748
ESP_IDF_VER=v5.0
4849
ESP_IDF_BRANCH=master
4950
ESP_BOARD=all
51+
NIGHTLY_VERSION=nightly-2022-03-30
5052
context: .
5153
platforms: linux/amd64, linux/arm64
5254
push: true
@@ -62,6 +64,7 @@ jobs:
6264
ESP_IDF_VER=v4.3.2
6365
ESP_IDF_BRANCH=release/v4.3
6466
ESP_BOARD=all
67+
NIGHTLY_VERSION=nightly-2022-03-30
6568
context: .
6669
platforms: linux/amd64
6770
push: true
@@ -77,6 +80,7 @@ jobs:
7780
ESP_IDF_VER=v4.4
7881
ESP_IDF_BRANCH=release/v4.4
7982
ESP_BOARD=esp32c3
83+
NIGHTLY_VERSION=nightly-2022-03-30
8084
context: .
8185
platforms: linux/amd64, linux/arm64
8286
push: true

.github/workflows/wokwi-tag.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ jobs:
2828
uses: docker/build-push-action@v2
2929
with:
3030
file: wokwi.Dockerfile
31-
with:
32-
build-args:|
33-
NIGHTLY_VERSION=nightly-2022-03-30
31+
build-args: |
32+
NIGHTLY_VERSION=nightly-2022-03-30
3433
context: .
3534
platforms: linux/amd64, linux/arm64
3635
push: true

wokwi.Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RUN git clone -b feature/fetch-dependencies https://github.com/SergioGasquez/esp
4343
cd $HOME/espressif-trainings/advanced/i2c-sensor-reading/solution && \
4444
$HOME/.cargo/bin/cargo fetch && \
4545
# Delete the repository
46-
rm -rf $HOME//espressif-trainings
46+
rm -rf $HOME/espressif-trainings
4747
# Fetch dependencies: ESP32S3
4848
RUN $HOME/.cargo/bin/cargo generate --vcs none --git https://github.com/esp-rs/esp-idf-template cargo --name esp32s3 --define mcu=esp32s3 --define toolchain=nightly --define espidfver=v4.4 --define std=true && \
4949
cd $HOME/esp32s3 && \
@@ -57,26 +57,26 @@ RUN $HOME/.cargo/bin/cargo generate --vcs none --git https://github.com/esp-rs/e
5757
RUN $HOME/.cargo/bin/cargo generate --vcs none --git https://github.com/esp-rs/esp-idf-template cargo --name esp32s2 --define mcu=esp32s2 --define toolchain=nightly --define espidfver=v4.4 --define std=true && \
5858
cd $HOME/esp32s2 && \
5959
$HOME/.cargo/bin/cargo +esp fetch && \
60-
rm -rf $HOME//esp32s2
60+
rm -rf $HOME/esp32s2
6161
RUN $HOME/.cargo/bin/cargo generate --vcs none --git https://github.com/esp-rs/esp-idf-template cargo --name esp32s2nostd --define mcu=esp32s2 --define toolchain=nightly --define espidfver=v4.4 --define std=false && \
6262
cd $HOME/esp32s2nostd && \
6363
$HOME/.cargo/bin/cargo +esp fetch && \
64-
rm -rf $HOME//esp32s2nostd
64+
rm -rf $HOME/esp32s2nostd
6565
# Fetch dependencies: ESP32
6666
RUN $HOME/.cargo/bin/cargo generate --vcs none --git https://github.com/esp-rs/esp-idf-template cargo --name esp32 --define mcu=esp32 --define toolchain=nightly --define espidfver=v4.4 --define std=true && \
6767
cd $HOME/esp32 && \
6868
$HOME/.cargo/bin/cargo +esp fetch && \
69-
rm -rf $HOME//esp32
69+
rm -rf $HOME/esp32
7070
RUN $HOME/.cargo/bin/cargo generate --vcs none --git https://github.com/esp-rs/esp-idf-template cargo --name esp32nostd --define mcu=esp32 --define toolchain=nightly --define espidfver=v4.4 --define std=false && \
7171
cd $HOME/esp32nostd && \
7272
$HOME/.cargo/bin/cargo +esp fetch && \
73-
rm -rf $HOME//esp32nostd
73+
rm -rf $HOME/esp32nostd
7474
# Fetch dependencies: ESP32C3
7575
RUN $HOME/.cargo/bin/cargo generate --vcs none --git https://github.com/esp-rs/esp-idf-template cargo --name esp32c3 --define mcu=esp32c3 --define toolchain=nightly --define espidfver=v4.4 --define std=true && \
7676
cd $HOME/esp32c3 && \
7777
$HOME/.cargo/bin/cargo fetch && \
78-
rm -rf $HOME//esp32c3
78+
rm -rf $HOME/esp32c3
7979
RUN $HOME/.cargo/bin/cargo generate --vcs none --git https://github.com/esp-rs/esp-idf-template cargo --name esp32c3nostd --define mcu=esp32c3 --define toolchain=nightly --define espidfver=v4.4 --define std=false && \
8080
cd $HOME/esp32c3nostd && \
8181
$HOME/.cargo/bin/cargo fetch && \
82-
rm -rf $HOME//esp32c3nostd
82+
rm -rf $HOME/esp32c3nostd

0 commit comments

Comments
 (0)