From 5fa55629e464f3cfe1a0cf3b3526f0d7356d4d6f Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Tue, 19 Jul 2022 12:08:59 +0200 Subject: [PATCH 1/4] Add crate-check test --- .github/workflows/installer-check.yaml | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/.github/workflows/installer-check.yaml b/.github/workflows/installer-check.yaml index b077784b..3e7250f6 100644 --- a/.github/workflows/installer-check.yaml +++ b/.github/workflows/installer-check.yaml @@ -15,10 +15,9 @@ jobs: strategy: fail-fast: false matrix: - board: ['esp32', 'esp32s3', 'esp32s3', 'esp32c3'] + board: ["esp32", "esp32s3", "esp32s3", "esp32c3"] steps: - - - name: Checkout + - name: Checkout uses: actions/checkout@v2 with: ref: ${{ github.event.inputs.rust-build-branch }} @@ -75,10 +74,9 @@ jobs: strategy: fail-fast: false matrix: - board: ['esp32', 'esp32s3', 'esp32s3', 'esp32c3'] + board: ["esp32", "esp32s3", "esp32s3", "esp32c3"] steps: - - - name: Checkout + - name: Checkout uses: actions/checkout@v2 with: ref: ${{ github.event.inputs.rust-build-branch }} @@ -94,5 +92,17 @@ jobs: cargo generate --git https://github.com/esp-rs/esp-template --name test-${{ matrix.board }} --vcs none --silent -d mcu=${{ matrix.board }} -d devcontainer=false cd test-${{ matrix.board }} cargo build - - + crate-check: + strategy: + matrix: + os: [ubuntu-latest, macos-latest] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + ref: ${{ github.event.inputs.rust-build-branch }} + - name: Install toolchain + run: | + bash install-rust-toolchain.sh \ + --extra-crates "espflash cargo-espflash ldproxy cargo-generate wokwi-server web-flash" \ No newline at end of file From 694b0b79495527c62ca1ffcb7067cc609023e6c1 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Tue, 19 Jul 2022 12:09:45 +0200 Subject: [PATCH 2/4] Add trigger when changing the CI file --- .github/workflows/installer-check.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/installer-check.yaml b/.github/workflows/installer-check.yaml index 3e7250f6..c670a2eb 100644 --- a/.github/workflows/installer-check.yaml +++ b/.github/workflows/installer-check.yaml @@ -4,9 +4,11 @@ on: push: paths: - "install-rust-toolchain.sh" + - ".github/workflows/installer-check.yaml" pull_request: paths: - "install-rust-toolchain.sh" + - ".github/workflows/installer-check.yaml" workflow_dispatch: jobs: From c2ad383de4355244bba65904e5941ee42155e95d Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Thu, 21 Jul 2022 14:22:59 +0200 Subject: [PATCH 3/4] Use `shell` property --- .github/workflows/installer-check.yaml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/installer-check.yaml b/.github/workflows/installer-check.yaml index c670a2eb..0fc4317a 100644 --- a/.github/workflows/installer-check.yaml +++ b/.github/workflows/installer-check.yaml @@ -14,6 +14,9 @@ on: jobs: esp-idf-v4-4: runs-on: ubuntu-latest + defaults: + run: + shell: bash strategy: fail-fast: false matrix: @@ -29,7 +32,7 @@ jobs: sudo apt-get install ninja-build - name: Install toolchain run: | - bash install-rust-toolchain.sh \ + ./install-rust-toolchain.sh \ --extra-crates "ldproxy cargo-generate" \ --build-target "${{ matrix.board }}" \ --esp-idf-version "release/v4.4" \ @@ -43,6 +46,9 @@ jobs: cargo build # esp-idf-master: # runs-on: ubuntu-latest + # defaults: + # run: + # shell: bash # strategy: # fail-fast: false # matrix: @@ -59,7 +65,7 @@ jobs: # sudo apt-get install ninja-build # - name: Install toolchain # run: | - # bash install-rust-toolchain.sh \ + # ./install-rust-toolchain.sh \ # --extra-crates "ldproxy cargo-generate" \ # --build-target "${{ matrix.board }}" \ # --esp-idf-version "master" \ @@ -73,6 +79,9 @@ jobs: # cargo build bare-metal: runs-on: ubuntu-latest + defaults: + run: + shell: bash strategy: fail-fast: false matrix: @@ -84,7 +93,7 @@ jobs: ref: ${{ github.event.inputs.rust-build-branch }} - name: Install toolchain run: | - bash install-rust-toolchain.sh \ + ./install-rust-toolchain.sh \ --extra-crates "ldproxy cargo-generate" \ --build-target "${{ matrix.board }}" \ --export-file "${HOME}/export-esp.sh" @@ -99,6 +108,9 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }} + defaults: + run: + shell: bash steps: - name: Checkout uses: actions/checkout@v2 @@ -106,5 +118,5 @@ jobs: ref: ${{ github.event.inputs.rust-build-branch }} - name: Install toolchain run: | - bash install-rust-toolchain.sh \ + ./install-rust-toolchain.sh \ --extra-crates "espflash cargo-espflash ldproxy cargo-generate wokwi-server web-flash" \ No newline at end of file From a48db8caf06df9541577444cc6c0e0820fe17f96 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Thu, 21 Jul 2022 15:11:23 +0200 Subject: [PATCH 4/4] Add empty line at the eof --- .github/workflows/installer-check.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installer-check.yaml b/.github/workflows/installer-check.yaml index 48216db3..e4249cce 100644 --- a/.github/workflows/installer-check.yaml +++ b/.github/workflows/installer-check.yaml @@ -125,7 +125,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest] - minified-llvm: ['YES', 'NO'] + minified-llvm: ["YES", "NO"] runs-on: ${{ matrix.os }} defaults: run: @@ -138,4 +138,4 @@ jobs: - name: Install toolchain run: | ./install-rust-toolchain.sh \ - --minified-llvm "${{ matrix.minified-llvm }}" \ No newline at end of file + --minified-llvm "${{ matrix.minified-llvm }}"