From 26dec18f8584c5de6841f3c34775187faabc5828 Mon Sep 17 00:00:00 2001 From: Alex Savin Date: Tue, 29 Apr 2025 13:44:55 -0400 Subject: [PATCH] Update .github/workflows/CI.yml --- .github/workflows/CI.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 62ad6e8..a7aadc0 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -50,10 +50,7 @@ jobs: echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT echo REPO_VERSION=${GITHUB_REF_NAME#v} >> $GITHUB_OUTPUT echo RELEASE_DATE=$(date --rfc-3339=date) >> ${GITHUB_ENV} - - name: Set outputs - id: vars - run: | - echo COMMIT_SHORT_SHA=${${{ github.sha }}:0:10} >> $GITHUB_OUTPUT + echo COMMIT_SHA_SHORT=$(echo $GITHUB_SHA | cut -c1-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"}" @@ -91,7 +88,7 @@ jobs: push: true tags: | docker.savin.nyc/${{ github.event.repository.name }}:nightly - docker.savin.nyc/${{ github.event.repository.name }}:${{ steps.vars.outputs.COMMIT_SHORT_SHA }} + docker.savin.nyc/${{ github.event.repository.name }}:${{ steps.vars.outputs.COMMIT_SHA_SHORT }} # ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }} # latest # build-args: | @@ -111,7 +108,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.COMMIT_SHORT_SHA }}","Env":"${{ github.ref_name}}"}}' + -d '{"ref":"${{ github.ref }}","inputs":{"Version":"${{ steps.vars.outputs.COMMIT_SHA_SHORT }}","Env":"${{ github.ref_name}}"}}' shell: bash # - name: Auto Deploy (Dev) ## if: ${{ contains(github.ref, 'develop') and env.AUTO_DEPLOY_DEV == 'true' }}