From 8ad02bd24c9587ba13ecf6986c79462f672126c5 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Fri, 16 Oct 2020 12:24:20 -0400 Subject: [PATCH] Update build Workflow Environment variable use --- .github/workflows/ESP32-A1S.yml | 11 +++++------ .github/workflows/I2S-4MBFlash.yml | 8 +++++--- .github/workflows/SqueezeAmp.yml | 10 +++++----- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ESP32-A1S.yml b/.github/workflows/ESP32-A1S.yml index 2906dd30..3b8f6689 100644 --- a/.github/workflows/ESP32-A1S.yml +++ b/.github/workflows/ESP32-A1S.yml @@ -13,11 +13,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Set target - run: echo '::set-output name=TARGET_BUILD_NAME::ESP32-A1S' + run: echo "TARGET_BUILD_NAME=ESP32-A1S" >> $GITHUB_ENV id: target-name-generator - - name: Get color - run: echo "Target is ${{steps.target-name-generator.outputs.TARGET_BUILD_NAME}}" - + - name: Show Target + run: echo "Target is ${TARGET_BUILD_NAME}" - uses: actions/checkout@v2 with: submodules: true @@ -31,7 +30,7 @@ jobs: uses: actions/cache@v1 with: path: ${{github.workspace}}/build - key: ${{ runner.os }}-${{ steps.target-name-generator.outputs.TARGET_BUILD_NAME}} + key: ${{ runner.os }}-${TARGET_BUILD_NAME} - name: Build the firmware run: | - docker run --rm -v $PWD:/project -w /project espressif/idf:release-v4.0 /bin/bash -c "cp build-scripts/${{ steps.target-name-generator.outputs.TARGET_BUILD_NAME}}-sdkconfig.defaults sdkconfig && export PROJECT_VER=${{ steps.target-name-generator.outputs.TARGET_BUILD_NAME}}-${{ steps.buildnumber.outputs.build_number }} && idf.py build" \ No newline at end of file + docker run --rm -v $PWD:/project -w /project espressif/idf:release-v4.0 /bin/bash -c "cp build-scripts/${TARGET_BUILD_NAME}-sdkconfig.defaults sdkconfig && export PROJECT_VER=${TARGET_BUILD_NAME}-${{ steps.buildnumber.outputs.build_number }} && idf.py build" \ No newline at end of file diff --git a/.github/workflows/I2S-4MBFlash.yml b/.github/workflows/I2S-4MBFlash.yml index 6ea69b29..04f63e3b 100644 --- a/.github/workflows/I2S-4MBFlash.yml +++ b/.github/workflows/I2S-4MBFlash.yml @@ -13,8 +13,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Set target - run: echo '::set-output name=TARGET_BUILD_NAME::I2S-4MFlash' + run: echo "TARGET_BUILD_NAME=I2S-4MFlash" >> $GITHUB_ENV id: target-name-generator + - name: Show Target + run: echo "Target is ${TARGET_BUILD_NAME}" - uses: actions/checkout@v2 with: submodules: true @@ -28,7 +30,7 @@ jobs: uses: actions/cache@v1 with: path: ${{github.workspace}}/build - key: ${{ runner.os }}-${{ steps.target-name-generator.outputs.TARGET_BUILD_NAME}} + key: ${{ runner.os }}-${TARGET_BUILD_NAME} - name: Build the firmware run: | - docker run --rm -v $PWD:/project -w /project espressif/idf:release-v4.0 /bin/bash -c "cp build-scripts/${{ steps.target-name-generator.outputs.TARGET_BUILD_NAME}}-sdkconfig.defaults sdkconfig && export PROJECT_VER=${{ steps.target-name-generator.outputs.TARGET_BUILD_NAME}}-${{ steps.buildnumber.outputs.build_number }} && idf.py build" + docker run --rm -v $PWD:/project -w /project espressif/idf:release-v4.0 /bin/bash -c "cp build-scripts/${TARGET_BUILD_NAME}-sdkconfig.defaults sdkconfig && export PROJECT_VER=${TARGET_BUILD_NAME}-${{ steps.buildnumber.outputs.build_number }} && idf.py build" \ No newline at end of file diff --git a/.github/workflows/SqueezeAmp.yml b/.github/workflows/SqueezeAmp.yml index aea3902f..dc6ef42b 100644 --- a/.github/workflows/SqueezeAmp.yml +++ b/.github/workflows/SqueezeAmp.yml @@ -13,10 +13,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Set target - run: echo '::set-output name=TARGET_BUILD_NAME::SqueezeAmp' + run: echo "TARGET_BUILD_NAME=SqueezeAmp" >> $GITHUB_ENV id: target-name-generator - - name: Get color - run: echo "Target is ${{steps.target-name-generator.outputs.TARGET_BUILD_NAME}}" + - name: Show Target + run: echo "Target is ${TARGET_BUILD_NAME}" - uses: actions/checkout@v2 with: submodules: true @@ -30,7 +30,7 @@ jobs: uses: actions/cache@v1 with: path: ${{github.workspace}}/build - key: ${{ runner.os }}-${{ steps.target-name-generator.outputs.TARGET_BUILD_NAME}} + key: ${{ runner.os }}-${TARGET_BUILD_NAME} - name: Build the firmware run: | - docker run --rm -v $PWD:/project -w /project espressif/idf:release-v4.0 /bin/bash -c "cp build-scripts/${{ steps.target-name-generator.outputs.TARGET_BUILD_NAME}}-sdkconfig.defaults sdkconfig && export PROJECT_VER=${{ steps.target-name-generator.outputs.TARGET_BUILD_NAME}}-${{ steps.buildnumber.outputs.build_number }} && idf.py build" \ No newline at end of file + docker run --rm -v $PWD:/project -w /project espressif/idf:release-v4.0 /bin/bash -c "cp build-scripts/${TARGET_BUILD_NAME}-sdkconfig.defaults sdkconfig && export PROJECT_VER=${TARGET_BUILD_NAME}-${{ steps.buildnumber.outputs.build_number }} && idf.py build" \ No newline at end of file