diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index edffa3d..62ad6e8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -52,7 +52,8 @@ jobs: echo RELEASE_DATE=$(date --rfc-3339=date) >> ${GITHUB_ENV} - name: Set outputs id: vars - run: echo "sha_short=${${{ github.sha }}:0:10}" >> $GITHUB_OUTPUT + run: | + echo COMMIT_SHORT_SHA=${${{ github.sha }}:0:10} >> $GITHUB_OUTPUT # echo "##[set-output name=version;]VERSION=${GITHUB_REF#$"refs/tags/v"}" # echo "##[set-output name=version_tag;]$GITHUB_REPOSITORY:${GITHUB_REF#$"refs/tags/v"}" @@ -90,7 +91,7 @@ jobs: push: true tags: | docker.savin.nyc/${{ github.event.repository.name }}:nightly - docker.savin.nyc/${{ github.event.repository.name }}:${{ steps.vars.outputs.sha_short }} + docker.savin.nyc/${{ github.event.repository.name }}:${{ steps.vars.outputs.COMMIT_SHORT_SHA }} # ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }} # latest # build-args: | @@ -110,7 +111,7 @@ jobs: -H 'Content-Type: application/json' \ -H 'Authorization: Basic ${{ echo -n "secrets.SECRET_USERNAME:secrets.SECRET_PASSWORD" | base64 }}' \ -H 'Authorization: token ${{ secrets.GHA_TOKEN }}' \ - -d '{"ref":"${{ github.ref }}","inputs":{"Version":"${{ steps.vars.outputs.sha_short }}","Env":"${{ github.ref_name}}"}}' + -d '{"ref":"${{ github.ref }}","inputs":{"Version":"${{ steps.vars.outputs.COMMIT_SHORT_SHA }}","Env":"${{ github.ref_name}}"}}' shell: bash # - name: Auto Deploy (Dev) ## if: ${{ contains(github.ref, 'develop') and env.AUTO_DEPLOY_DEV == 'true' }} @@ -124,4 +125,4 @@ jobs: id: output-summary shell: bash run: | - echo "CI pipeline has been compiled for ${{ github.repository }} with a new version ${{ steps.vars.outputs.sha_short }}" >> $GITHUB_STEP_SUMMARY + echo "CI pipeline has been compiled for ${{ github.repository }} with a new version ${{ steps.vars.outputs.COMMIT_SHORT_SHA }}" >> $GITHUB_STEP_SUMMARY