From 53a346a76522163a8d5118e87f39698b52c0e38c Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 22 Dec 2023 17:45:26 +0100 Subject: [PATCH 1/5] ci: Update json and toml files --- .github/workflows/release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 206280b..42bd361 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,8 @@ jobs: - uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ env.GITHUB_TOKEN }} - file: "${{ matrix.build.chip }}.json" + file: "${{ matrix.build.chip }}.*" + file_glob: true tag: ${{ github.ref }} # -------------------------------------------------------------------------- @@ -73,5 +74,6 @@ jobs: - uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ env.GITHUB_TOKEN }} - file: "${{ matrix.build.chip }}.json" + file: "${{ matrix.build.chip }}.*" + file_glob: true tag: ${{ github.ref }} From 87fe73bbd4aa676637f496d790fe2d9f92560eba Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 22 Dec 2023 17:45:56 +0100 Subject: [PATCH 2/5] ci: Update actions/checkout action --- .github/workflows/ci.yml | 14 +++++++------- .github/workflows/release.yml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c39c5d..61f621d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@v1 with: target: ${{ matrix.build.target }} @@ -62,7 +62,7 @@ jobs: ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: esp-rs/xtensa-toolchain@v1.5 with: default: true @@ -89,7 +89,7 @@ jobs: ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@v1 with: target: ${{ matrix.build.target }} @@ -113,7 +113,7 @@ jobs: ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: esp-rs/xtensa-toolchain@v1.5 with: default: true @@ -127,7 +127,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@v1 with: toolchain: nightly @@ -154,7 +154,7 @@ jobs: ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@v1 with: target: ${{ matrix.build.target }} @@ -177,7 +177,7 @@ jobs: ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: esp-rs/xtensa-toolchain@v1.5 with: default: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 42bd361..eade5c8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@v1 with: target: ${{ matrix.build.target }} @@ -61,7 +61,7 @@ jobs: ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: esp-rs/xtensa-toolchain@v1.5 with: default: true From 9192dfbf14e2f2aa722638766d69717eecb48860 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 22 Dec 2023 17:51:03 +0100 Subject: [PATCH 3/5] ci: Update working directory --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eade5c8..1b852d0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,6 +36,7 @@ jobs: - uses: Swatinem/rust-cache@v2 - name: build & wrap (${{ matrix.build.chip }}) + working-directory: xtask run: cargo xtask wrap ${{ matrix.build.chip }} - uses: svenstaro/upload-release-action@v2 with: @@ -70,6 +71,7 @@ jobs: - uses: Swatinem/rust-cache@v2 - name: build & wrap (${{ matrix.build.chip }}) + working-directory: xtask run: cargo xtask wrap ${{ matrix.build.chip }} - uses: svenstaro/upload-release-action@v2 with: From 8aad54ec17f9092ae8eec821ac53dba90eb31d3c Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 22 Dec 2023 17:54:28 +0100 Subject: [PATCH 4/5] ci: Fix xtask command --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1b852d0..8af85c5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: - name: build & wrap (${{ matrix.build.chip }}) working-directory: xtask - run: cargo xtask wrap ${{ matrix.build.chip }} + run: cargo run -- wrap ${{ matrix.build.chip }} - uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ env.GITHUB_TOKEN }} @@ -72,7 +72,7 @@ jobs: - name: build & wrap (${{ matrix.build.chip }}) working-directory: xtask - run: cargo xtask wrap ${{ matrix.build.chip }} + run: cargo run -- wrap ${{ matrix.build.chip }} - uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ env.GITHUB_TOKEN }} From a561ccb2c5ebf0b618712e6848f57fa7ad5b2afd Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 22 Dec 2023 18:02:26 +0100 Subject: [PATCH 5/5] ci: Unify jobs --- .github/workflows/release.yml | 42 +++++++---------------------------- 1 file changed, 8 insertions(+), 34 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8af85c5..3cd6e3a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,10 +9,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} jobs: - # -------------------------------------------------------------------------- - # Release (RISC-V) - - release-riscv: + release: runs-on: ubuntu-latest strategy: @@ -20,50 +17,27 @@ jobs: matrix: build: [ + { chip: "esp32", target: "xtensa-esp32-none-elf" }, { chip: "esp32c2", target: "riscv32imc-unknown-none-elf" }, { chip: "esp32c3", target: "riscv32imc-unknown-none-elf" }, { chip: "esp32c6", target: "riscv32imac-unknown-none-elf" }, { chip: "esp32h2", target: "riscv32imac-unknown-none-elf" }, + { chip: "esp32s2", target: "xtensa-esp32s2-none-elf" }, + { chip: "esp32s3", target: "xtensa-esp32s3-none-elf" }, ] steps: - uses: actions/checkout@v4 + # RISC-V toolchain - uses: dtolnay/rust-toolchain@v1 + if: matrix.build.chip != 'esp32' && matrix.build.chip != 'esp32s2' && matrix.build.chip != 'esp32s3' with: target: ${{ matrix.build.target }} toolchain: nightly components: rust-src - - uses: Swatinem/rust-cache@v2 - - - name: build & wrap (${{ matrix.build.chip }}) - working-directory: xtask - run: cargo run -- wrap ${{ matrix.build.chip }} - - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ env.GITHUB_TOKEN }} - file: "${{ matrix.build.chip }}.*" - file_glob: true - tag: ${{ github.ref }} - - # -------------------------------------------------------------------------- - # Release (Xtensa) - - release-xtensa: - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - build: - [ - { chip: "esp32", target: "xtensa-esp32-none-elf" }, - { chip: "esp32s2", target: "xtensa-esp32s2-none-elf" }, - { chip: "esp32s3", target: "xtensa-esp32s3-none-elf" }, - ] - - steps: - - uses: actions/checkout@v4 + # Xtensa toolchain - uses: esp-rs/xtensa-toolchain@v1.5 + if: matrix.build.chip == 'esp32' || matrix.build.chip == 'esp32s2' || matrix.build.chip == 'esp32s3' with: default: true ldproxy: false