Merge jobs: use GITHUB_ENV to pass the container name to subsequent s…

…teps.
collectd · Nov 23, 2023 · 2cdf9bc · 2cdf9bc
1 parent 7197f8e
commit 2cdf9bc
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/.github/workflows/merge-jobs.yml b/.github/workflows/merge-jobs.yml
@@ -10,20 +10,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Get branch name
+      - name: Determine container name
         run: |
-          export BRANCH="$(sed -e 's#refs/heads/##' <<<"${{ github.ref }}")"
-      - run: |
-          export SLUG="collectd/ci:${BRANCH:?}"
+          branch="$(sed -e 's#refs/heads/##' <<<"${GITHUB_REV}")"
+          echo "SLUG='collectd/ci:${branch:?}'" >>"${GITHUB_ENV}"
       - name: Build container
-        run:
-          docker build --pull -t "${SLUG}" .
-      - run: docker inspect "${SLUG}"
-      - run: docker history "${SLUG}"
+        run: docker build --pull -t "${SLUG:?}" .
+      - run: docker inspect "${SLUG:?}"
+      - run: docker history "${SLUG:?}"
       - run: docker images
       - name: Log into the container registry
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-      - run: docker push "${SLUG}"
+      - run: docker push "${SLUG:?}"