diff --git a/.github/workflows/build_esptool.yml b/.github/workflows/build_esptool.yml index 6b7d0390d..2744006b1 100644 --- a/.github/workflows/build_esptool.yml +++ b/.github/workflows/build_esptool.yml @@ -72,31 +72,11 @@ jobs: with: name: ${{ env.DISTPATH }} path: ${{ env.DISTPATH }} - - name: Build stub - if: matrix.os == 'ubuntu-latest' - run: | - export TOOLCHAIN_DIR=$HOME/toolchain - export ESP8266_BINDIR=$TOOLCHAIN_DIR/xtensa-lx106-elf/bin - export ESP32_BINDIR=$TOOLCHAIN_DIR/xtensa-esp32-elf/bin - export ESP32S2_BINDIR=$TOOLCHAIN_DIR/xtensa-esp32s2-elf/bin - export ESP32S3_BINDIR=$TOOLCHAIN_DIR/xtensa-esp32s3-elf/bin - export ESP32C3_BINDIR=$TOOLCHAIN_DIR/riscv32-esp-elf/bin - export PATH=$PATH:$ESP8266_BINDIR:$ESP32_BINDIR:$ESP32S2_BINDIR:$ESP32S3_BINDIR:$ESP32C3_BINDIR - ./ci/setup_ci_build_env.sh - make -C flasher_stub V=1 - rm /home/runner/work/esptool/esptool/flasher_stub/build/*.elf - rm /home/runner/work/esptool/esptool/flasher_stub/build/*.map - name: Update package.json when a release tag is set if: startsWith(github.ref, 'refs/tags/') && matrix.os == 'ubuntu-latest' run: | rm package.json python ci/gen_pio_manifest.py -o "./" -s ${{ github.ref_name }} - - name: Upload stubs artifact - if: matrix.os == 'ubuntu-latest' - uses: jason2866/upload-artifact@v2.0.3 - with: - name: stubs - path: /home/runner/work/esptool/esptool/flasher_stub/build - name: Upload package.json artifact if: matrix.os == 'ubuntu-latest' uses: jason2866/upload-artifact@v2.0.3 @@ -105,7 +85,7 @@ jobs: path: /home/runner/work/esptool/esptool/package.json push_stubs: - name: Commit changed files + name: Commit changed package.json needs: build-esptool-binaries runs-on: ubuntu-latest steps: @@ -117,14 +97,12 @@ jobs: uses: jason2866/download-artifact@v3.0.4 with: name: | - stubs manifest path: | - ./esptool/targets/stub_flasher ./ - uses: stefanzweifel/git-auto-commit-action@v5 with: - commit_message: updated files + commit_message: update manifest release: name: Upload release binaries