From 3c0c409c651bae1b241ed6cd06256bbdf9001e8c Mon Sep 17 00:00:00 2001 From: Danny Hadley Date: Tue, 8 Nov 2022 10:09:21 -0500 Subject: [PATCH] fix output maybe --- .github/workflows/all.yml | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml index 7dffb83..8533405 100644 --- a/.github/workflows/all.yml +++ b/.github/workflows/all.yml @@ -25,7 +25,9 @@ jobs: - name: "set output: short_sha" id: vars - run: echo "sha_short=$(echo $GITHUB_SHA | head -c 7) >> $GITHUB_ENV" + run: echo "SHA_SHORT=$(echo $GITHUB_SHA | head -c 7)">>$GITHUB_OUTPUT + - name: "set output: verify" + run: echo "${{ steps.vars.outputs.SHA_SHORT }}" - name: "apt update" run: sudo apt-get update @@ -56,7 +58,7 @@ jobs: - name: "build - make release" run: make release \ - VERSION=${{ env.sha_short }} \ + VERSION=${{ steps.vars.outputs.SHA_SHORT }} \ LOGIN_URL=${{ env.LOGIN_URL }} \ API_ROOT=${{ env.API_ROOT }} \ LOGOUT_URL=${{ env.LOGOUT_URL }} \ @@ -69,12 +71,12 @@ jobs: - name: "bundle - populate" run: cp -r target/release milton-ui-dist - name: "bundle - create" - run: tar cvzf milton-ui-${{ env.sha_short }}.tar.gz milton-ui-dist + run: tar cvzf milton-ui-${{ steps.vars.outputs.SHA_SHORT }}.tar.gz milton-ui-dist - uses: actions/upload-artifact@v3 with: - name: milton-ui-${{ env.sha_short }}.tar.gz - path: src/milton-ui/milton-ui-${{ env.sha_short }}.tar.gz + name: milton-ui-${{ steps.vars.outputs.SHA_SHORT }}.tar.gz + path: src/milton-ui/milton-ui-${{ steps.vars.outputs.SHA_SHORT }}.tar.gz # rust middleware compilation build-web: @@ -89,9 +91,12 @@ jobs: - name: "set output: verify git version" run: git --version + - name: "set output: short_sha" id: vars - run: echo "sha_short=$(echo $GITHUB_SHA | head -c 7) >> $GITHUB_ENV" + run: echo "SHA_SHORT=$(echo $GITHUB_SHA | head -c 7)">>$GITHUB_OUTPUT + - name: "set output: verify" + run: echo "${{ steps.vars.outputs.SHA_SHORT }}" - name: "apt - update" run: apt-get update @@ -113,7 +118,7 @@ jobs: env: OPENSSL_LIB_DIR: /etc/arm-dependencies/openssl-3.0.7 OPENSSL_INCLUDE_DIR: /etc/arm-dependencies/openssl-3.0.7/include - MILTON_VERSION: "${{ env.sha_short }}" + MILTON_VERSION: "${{ steps.vars.outputs.SHA_SHORT }}" # bundling + artifact generation: - name: "bundle - prepare" @@ -121,12 +126,12 @@ jobs: - name: "bundle - populate" run: cp target/aarch64-unknown-linux-gnu/release/milton milton-web-dist/bin/milton - name: "bundle - create" - run: tar cvzf milton-web-aarch64-unknown-linux-gnu-${{ env.sha_short }}.tar.gz milton-web-dist + run: tar cvzf milton-web-aarch64-unknown-linux-gnu-${{ steps.vars.outputs.SHA_SHORT }}.tar.gz milton-web-dist - uses: actions/upload-artifact@v3 with: - name: milton-web-aarch64-unknown-linux-gnu-${{ env.sha_short }}.tar.gz - path: src/milton-web/milton-web-aarch64-unknown-linux-gnu-${{ env.sha_short }}.tar.gz + name: milton-web-aarch64-unknown-linux-gnu-${{ steps.vars.outputs.SHA_SHORT }}.tar.gz + path: src/milton-web/milton-web-aarch64-unknown-linux-gnu-${{ steps.vars.outputs.SHA_SHORT }}.tar.gz publish: runs-on: ubuntu-latest @@ -136,14 +141,16 @@ jobs: - name: "set output: short_sha" id: vars - run: echo "sha_short=$(echo $GITHUB_SHA | head -c 7) >> $GITHUB_ENV" + run: echo "SHA_SHORT=$(echo $GITHUB_SHA | head -c 7)">>$GITHUB_OUTPUT + - name: "set output: verify" + run: echo "${{ steps.vars.outputs.SHA_SHORT }}" - uses: actions/download-artifact@v3 with: - name: "milton-web-aarch64-unknown-linux-gnu-${{ env.sha_short }}.tar.gz" + name: "milton-web-aarch64-unknown-linux-gnu-${{ steps.vars.outputs.SHA_SHORT }}.tar.gz" - uses: actions/download-artifact@v3 with: - name: "milton-ui-${{ env.sha_short }}.tar.gz" + name: "milton-ui-${{ steps.vars.outputs.SHA_SHORT }}.tar.gz" - name: release uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/')