diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 2470324..9dbc209 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -8,7 +8,6 @@ on: env: DOCKER_TLS_CERTDIR: /certs IMAGE_TAG: ${{ github.sha }} - SHORT_SHA: ${{ github.sha }} jobs: splatoon: @@ -32,13 +31,10 @@ jobs: - name: Login to registry run: docker login -u ${{ secrets.PACKAGE_USER }} -p ${{ secrets.PACKAGE_PWD }} git.spbr.net - - name: Set short SHA - run: echo "SHORT_SHA=${GITHUB_SHA::6}" >> $GITHUB_ENV - - name: Build Splatoon edition env: CI_REGISTRY_IMAGE: git.spbr.net/spacebar/rust-nex - CI_COMMIT_SHORT_SHA: ${{ env.SHORT_SHA }} + CI_COMMIT_SHORT_SHA: ${{ github.sha }} run: ./.ci-scripts/make-edition.sh splatoon friends: @@ -59,14 +55,11 @@ jobs: ~/.local/share/containers/storage key: image-cache - - name: Set short SHA - run: echo "SHORT_SHA=${GITHUB_SHA::6}" >> $GITHUB_ENV - - name: Login to registry run: podman login -u ${{ secrets.PACKAGE_USER }} -p ${{ secrets.PACKAGE_PWD }} git.spbr.net - name: Build Friends edition env: CI_REGISTRY_IMAGE: git.spbr.net/spacebar/rust-nex - CI_COMMIT_SHORT_SHA: ${{ env.SHORT_SHA }} + CI_COMMIT_SHORT_SHA: ${{ github.sha }} run: ./.ci-scripts/make-edition.sh friends