From 193b15a217c425403749589866f56b0315575285 Mon Sep 17 00:00:00 2001 From: Peter Jakobs Date: Mon, 23 Dec 2024 16:29:15 +0100 Subject: [PATCH] changeing the workflow files again --- .github/workflows/build_firmware.yml | 9 +++------ .github/workflows/deploy-pages.yml | 6 ++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build_firmware.yml b/.github/workflows/build_firmware.yml index 8c1b22f..e453313 100644 --- a/.github/workflows/build_firmware.yml +++ b/.github/workflows/build_firmware.yml @@ -53,10 +53,7 @@ jobs: if [ -d ./webapp ]; then rm -rf ./webapp mkdir ./webapp - fi - artifact_url=$(curl -s -H "Authorization: token ${{ secrets.artifact_download_token }}" \ - "https://api.github.com/repos/pljakobs/esp_rgb_webapp2/actions/runs/${{ env.latest_run_id }}/artifacts" | \ - jq -r '.artifacts[] | select(.name=="spa-files") | .archive_download_url') + fioutlect(.name=="spa-files") | .archive_download_url') curl -L -o spa-files.zip -H "Authorization: token ${{ secrets.artifact_download_token }}" "$artifact_url" unzip spa-files.zip -d ./webapp @@ -89,9 +86,9 @@ jobs: id: set_firmware_path run: | if [ "${{ matrix.soc }}" = "esp8266" ] && [ "${{ matrix.release }}" = "0" ]; then - echo "path=out/Esp8266/debug/build/app_0.out" >> $GITHUB_OUTPUT + echo "path=out/Esp8266/debug/firmware/rom0.bin" >> $GITHUB_OUTPUT elif [ "${{ matrix.soc }}" = "esp8266" ] && [ "${{ matrix.release }}" = "1" ]; then - echo "path=out/Esp8266/release/build/app_0.out" >> $GITHUB_OUTPUT + echo "path=out/Esp8266/release/firmware/rom0.bin" >> $GITHUB_OUTPUT elif [ "${{ matrix.soc }}" = "esp32" ] && [ "${{ matrix.release }}" = "0" ]; then echo "path=out/Esp32/esp32/debug/firmware/app.bin" >> $GITHUB_OUTPUT elif [ "${{ matrix.soc }}" = "esp32" ] && [ "${{ matrix.release }}" = "1" ]; then diff --git a/.github/workflows/deploy-pages.yml b/.github/workflows/deploy-pages.yml index 09c0f5b..6028815 100644 --- a/.github/workflows/deploy-pages.yml +++ b/.github/workflows/deploy-pages.yml @@ -2,10 +2,8 @@ name: Publish Firmware on: workflow_run: - workflows: - - build_application # Must match the name in build_firmware.yml - types: - - completed + workflows: [ "build_application" ] # Must match the name in build_firmware.yml + types: [ "completed" ] jobs: get-version: