Skip to content

Commit 321b564

Browse files
ivmarkovivmarkov
committed
Remove -Zbuild-std-features=panic_immediate_abort because new rustc no longer supports it this way
1 parent dc79421 commit 321b564

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,36 +60,36 @@ jobs:
6060
# if: matrix.target == 'riscv32imc-esp-espidf' && matrix.idf-version == 'v5.2.3'
6161
# env:
6262
# RUSTFLAGS: "${{ '--cfg espidf_time64' }}"
63-
# run: cargo clippy --features pio --no-deps --target ${{ matrix.target }} -Zbuild-std=std,panic_abort -Zbuild-std-features=panic_immediate_abort -- -Dwarnings
63+
# run: cargo clippy --features pio --no-deps --target ${{ matrix.target }} -Zbuild-std=std,panic_abort -- -Dwarnings
6464

6565
- name: Build | Clippy
6666
if: matrix.target != 'riscv32imac-esp-espidf' || matrix.idf-version != 'v4.4.8'
6767
env:
6868
ESP_IDF_VERSION: ${{ matrix.idf-version }}
6969
ESP_IDF_SDKCONFIG_DEFAULTS: "${{ github.workspace }}/.github/configs/sdkconfig.defaults"
7070
RUSTFLAGS: "${{ startsWith(matrix.idf-version, 'v5') && '--cfg espidf_time64' || startsWith(matrix.idf-version, 'v4') && '--cfg espidf_time32' }}"
71-
run: cargo clippy --no-deps --target ${{ matrix.target }} -Zbuild-std=std,panic_abort -Zbuild-std-features=panic_immediate_abort -- -Dwarnings -Adeprecated
71+
run: cargo clippy --no-deps --target ${{ matrix.target }} -Zbuild-std=std,panic_abort -- -Dwarnings -Adeprecated
7272

7373
- name: Build | Compile (Native)
7474
if: matrix.target != 'riscv32imac-esp-espidf' || matrix.idf-version != 'v4.4.8'
7575
env:
7676
ESP_IDF_VERSION: ${{ matrix.idf-version }}
7777
RUSTFLAGS: "${{ startsWith(matrix.idf-version, 'v5') && '--cfg espidf_time64' || startsWith(matrix.idf-version, 'v4') && '--cfg espidf_time32' }}"
78-
run: cargo build --target ${{ matrix.target }} -Zbuild-std=std,panic_abort -Zbuild-std-features=panic_immediate_abort
78+
run: cargo build --target ${{ matrix.target }} -Zbuild-std=std,panic_abort
7979

8080
- name: Build | Compile (Native), no_std
8181
if: matrix.target != 'riscv32imac-esp-espidf' || matrix.idf-version != 'v4.4.8'
8282
env:
8383
ESP_IDF_VERSION: ${{ matrix.idf-version }}
8484
RUSTFLAGS: "${{ startsWith(matrix.idf-version, 'v5') && '--cfg espidf_time64' || startsWith(matrix.idf-version, 'v4') && '--cfg espidf_time32' }}"
85-
run: cargo build --target ${{ matrix.target }} --no-default-features -Zbuild-std=std,panic_abort -Zbuild-std-features=panic_immediate_abort
85+
run: cargo build --target ${{ matrix.target }} --no-default-features -Zbuild-std=std,panic_abort
8686

8787
# - name: Build | Compile (Native), alloc
8888
# if: matrix.target != 'riscv32imac-esp-espidf' || matrix.idf-version != 'v4.4.8'
8989
# env:
9090
# ESP_IDF_VERSION: ${{ matrix.idf-version }}
9191
# RUSTFLAGS: "${{ startsWith(matrix.idf-version, 'v5') && '--cfg espidf_time64' || '' }}"
92-
# run: cargo build --no-default-features --features alloc --target ${{ matrix.target }} -Zbuild-std=std,panic_abort -Zbuild-std-features=panic_immediate_abort
92+
# run: cargo build --no-default-features --features alloc --target ${{ matrix.target }} -Zbuild-std=std,panic_abort
9393

9494
- name: Setup | ldproxy
9595
if: matrix.target == 'riscv32imc-esp-espidf'
@@ -103,11 +103,11 @@ jobs:
103103
env:
104104
ESP_IDF_VERSION: ${{ matrix.idf-version }}
105105
RUSTFLAGS: "${{ startsWith(matrix.idf-version, 'v5') && '--cfg espidf_time64' || startsWith(matrix.idf-version, 'v4') && '--cfg espidf_time32' }}"
106-
run: cargo clippy --examples --target ${{ matrix.target }} -Zbuild-std=std,panic_abort -Zbuild-std-features=panic_immediate_abort -- -Dwarnings -Adeprecated
106+
run: cargo clippy --examples --target ${{ matrix.target }} -Zbuild-std=std,panic_abort -- -Dwarnings -Adeprecated
107107

108108
- name: Build | Examples
109109
if: matrix.target != 'riscv32imac-esp-espidf' || matrix.idf-version != 'v4.4.8'
110110
env:
111111
ESP_IDF_VERSION: ${{ matrix.idf-version }}
112112
RUSTFLAGS: "${{ startsWith(matrix.idf-version, 'v5') && '--cfg espidf_time64' || startsWith(matrix.idf-version, 'v4') && '--cfg espidf_time32' }}"
113-
run: cargo build --examples --target ${{ matrix.target }} -Zbuild-std=std,panic_abort -Zbuild-std-features=panic_immediate_abort
113+
run: cargo build --examples --target ${{ matrix.target }} -Zbuild-std=std,panic_abort

‎.github/workflows/publish-dry-run.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
components: rust-src
2222

2323
- name: Build | Publish Dry Run
24-
run: export ESP_IDF_TOOLS_INSTALL_DIR=out; export ESP_IDF_SDKCONFIG_DEFAULTS=$(pwd)/.github/configs/sdkconfig.defaults; cargo publish --dry-run --target riscv32imc-esp-espidf -Zbuild-std=std,panic_abort -Zbuild-std-features=panic_immediate_abort
24+
run: export ESP_IDF_TOOLS_INSTALL_DIR=out; export ESP_IDF_SDKCONFIG_DEFAULTS=$(pwd)/.github/configs/sdkconfig.defaults; cargo publish --dry-run --target riscv32imc-esp-espidf -Zbuild-std=std,panic_abort

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
run: cargo login ${{ secrets.crates_io_token }}
2626

2727
- name: Build | Publish
28-
run: export ESP_IDF_TOOLS_INSTALL_DIR=out; export ESP_IDF_SDKCONFIG_DEFAULTS=$(pwd)/.github/configs/sdkconfig.defaults; cargo publish --target riscv32imc-esp-espidf -Zbuild-std=std,panic_abort -Zbuild-std-features=panic_immediate_abort
28+
run: export ESP_IDF_TOOLS_INSTALL_DIR=out; export ESP_IDF_SDKCONFIG_DEFAULTS=$(pwd)/.github/configs/sdkconfig.defaults; cargo publish --target riscv32imc-esp-espidf -Zbuild-std=std,panic_abort
2929

3030
- name: Build Documentation
31-
run: cargo doc --features native --target riscv32imc-esp-espidf -Zbuild-std=std,panic_abort -Zbuild-std-features=panic_immediate_abort; echo "<meta http-equiv=\"refresh\" content=\"0; url=esp_idf_sys\">" > target/riscv32imc-esp-espidf/doc/index.html; mv target/riscv32imc-esp-espidf/doc ./docs
31+
run: cargo doc --features native --target riscv32imc-esp-espidf -Zbuild-std=std,panic_abort; echo "<meta http-equiv=\"refresh\" content=\"0; url=esp_idf_sys\">" > target/riscv32imc-esp-espidf/doc/index.html; mv target/riscv32imc-esp-espidf/doc ./docs
3232

3333
- name: Deploy Documentation
3434
if: ${{ github.ref == 'refs/heads/master' }}

0 commit comments

Comments
 (0)