BUILDAH_EXTRA_ARGS syntax change

BlueBrain · Oct 2, 2024 · ef753cc · ef753cc
1 parent ad813fd
commit ef753cc
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/.github/workflows/spacktainer.yaml b/.github/workflows/spacktainer.yaml
@@ -16,13 +16,13 @@ jobs:
  AWS_BUILDER_REPO_URL: ${{ secrets.AWS_ECR_URL }}/spacktainers/builder
  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ECR_ACCESS_KEY_ID }}
  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ECR_SECRET_ACCESS_KEY }}
- BUILDAH_EXTRA_ARGS: ( '--label org.opencontainers.image.revision="$GITHUB_SHA"'
- ' --label org.opencontainers.image.authors="$GITHUB_TRIGGERING_ACTOR"'
- ' --label org.opencontainers.image.url="https:/${GITHUB_REPOSITORY}"'
- ' --label org.opencontainers.image.source="https:/${GITHUB_REPOSITORY}"'
- ' --label ch.epfl.bbpgitlab.ci-pipeline-url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID"'
- ' --label ch.epfl.bbpgitlab.ci-commit-branch="$GITHUB_REF_NAME"' '--build-arg
- SPACK_BRANCH=59179764d711a9a4e9e36b5b08a8587e2455a651')
+ BUILDAH_EXTRA_ARGS: --label org.opencontainers.image.revision="$GITHUB_SHA"
+ --label org.opencontainers.image.authors="$GITHUB_TRIGGERING_ACTOR"
+ --label org.opencontainers.image.url="https:/${GITHUB_REPOSITORY}"
+ --label org.opencontainers.image.source="https:/${GITHUB_REPOSITORY}"
+ --label ch.epfl.bbpgitlab.ci-pipeline-url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID"
+ --label ch.epfl.bbpgitlab.ci-commit-branch="$GITHUB_REF_NAME"
+ --build-arg SPACK_BRANCH=59179764d711a9a4e9e36b5b08a8587e2455a651
  # ' --label org.opencontainers.image.created="$CI_JOB_STARTED_AT"'
  run: |-
  echo "Creating builder"
@@ -47,13 +47,13 @@ jobs:
  AWS_BUILDER_REPO_URL: ${{ secrets.AWS_ECR_URL }}/spacktainers/runtime
  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ECR_ACCESS_KEY_ID }}
  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ECR_SECRET_ACCESS_KEY }}
- BUILDAH_EXTRA_ARGS: ( '--label org.opencontainers.image.revision="$GITHUB_SHA"'
- ' --label org.opencontainers.image.authors="$GITHUB_TRIGGERING_ACTOR"'
- ' --label org.opencontainers.image.url="https:/${GITHUB_REPOSITORY}"'
- ' --label org.opencontainers.image.source="https:/${GITHUB_REPOSITORY}"'
- ' --label ch.epfl.bbpgitlab.ci-pipeline-url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID"'
- ' --label ch.epfl.bbpgitlab.ci-commit-branch="$GITHUB_REF_NAME"' '--build-arg
- SPACK_BRANCH=59179764d711a9a4e9e36b5b08a8587e2455a651')
+ BUILDAH_EXTRA_ARGS: --label org.opencontainers.image.revision="$GITHUB_SHA"
+ --label org.opencontainers.image.authors="$GITHUB_TRIGGERING_ACTOR"
+ --label org.opencontainers.image.url="https:/${GITHUB_REPOSITORY}"
+ --label org.opencontainers.image.source="https:/${GITHUB_REPOSITORY}"
+ --label ch.epfl.bbpgitlab.ci-pipeline-url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID"
+ --label ch.epfl.bbpgitlab.ci-commit-branch="$GITHUB_REF_NAME"
+ --build-arg SPACK_BRANCH=59179764d711a9a4e9e36b5b08a8587e2455a651
  # ' --label org.opencontainers.image.created="$CI_JOB_STARTED_AT"'
  run: |-
  # Holy code duplication, Batman!