Formatting

BlueBrain · Oct 8, 2024 · 0146e9e · 0146e9e
1 parent 897ca5e
commit 0146e9e
Showing 1 changed file with 50 additions and 49 deletions.
diff --git a/.github/workflows/spacktainer.yaml b/.github/workflows/spacktainer.yaml
@@ -3,66 +3,65 @@ name: Build Spacktainers
 on: [push]
 jobs:
   base-container-job:
-   runs-on:
-     - codebuild-spacktainers-${{ github.run_id }}-${{ github.run_attempt }}
-     - image:ubuntu-7.0
-     - instance-size:small
-   steps:
-     - name: clone repo
-       uses: actions/checkout@v4
-     - name: create builder
-       uses: ./.github/actions/build_container
-       with:
-         AWS_ECR_URL: ${{ secrets.AWS_ECR_URL }}
-         AWS_ECR_PATH: /spacktainers/builder
-         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ECR_ACCESS_KEY_ID }}
-         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ECR_SECRET_ACCESS_KEY }}
-         BUILD_PATH: builder
-         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.com/${GITHUB_REPOSITORY}"
-           --label org.opencontainers.image.source="https://github.com/${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=develop
+    runs-on:
+      - codebuild-spacktainers-${{ github.run_id }}-${{ github.run_attempt }}
+      - image:ubuntu-7.0
+      - instance-size:small
+    steps:
+      - name: clone repo
+        uses: actions/checkout@v4
+      - name: create builder
+        uses: ./.github/actions/build_container
+        with:
+          AWS_ECR_URL: ${{ secrets.AWS_ECR_URL }}
+          AWS_ECR_PATH: /spacktainers/builder
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ECR_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ECR_SECRET_ACCESS_KEY }}
+          BUILD_PATH: builder
+          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.com/${GITHUB_REPOSITORY}"
+            --label org.opencontainers.image.source="https://github.com/${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=develop
          # ' --label org.opencontainers.image.created="$CI_JOB_STARTED_AT"'
-         DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
-         DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-         SPACK_DEPLOYMENT_KEY_PUB: ${{ secrets.SPACK_DEPLOYMENT_KEY_PUB }}
-         SPACK_DEPLOYMENT_KEY_PRIVATE: ${{ secrets.SPACK_DEPLOYMENT_KEY_PRIVATE }}
-     - name: create runtime
-       uses: ./.github/actions/build_container
-       with:
-         AWS_ECR_URL: ${{ secrets.AWS_ECR_URL }}
-         AWS_ECR_PATH: /spacktainers/runtime
-         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ECR_ACCESS_KEY_ID }}
-         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ECR_SECRET_ACCESS_KEY }}
-         BUILD_PATH: runtime
-         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.com/${GITHUB_REPOSITORY}"
-           --label org.opencontainers.image.source="https://github.com/${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=develop
+          DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
+          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          SPACK_DEPLOYMENT_KEY_PUB: ${{ secrets.SPACK_DEPLOYMENT_KEY_PUB }}
+          SPACK_DEPLOYMENT_KEY_PRIVATE: ${{ secrets.SPACK_DEPLOYMENT_KEY_PRIVATE }}
+      - name: create runtime
+        uses: ./.github/actions/build_container
+        with:
+          AWS_ECR_URL: ${{ secrets.AWS_ECR_URL }}
+          AWS_ECR_PATH: /spacktainers/runtime
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ECR_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ECR_SECRET_ACCESS_KEY }}
+          BUILD_PATH: runtime
+          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.com/${GITHUB_REPOSITORY}"
+            --label org.opencontainers.image.source="https://github.com/${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=develop
          # ' --label org.opencontainers.image.created="$CI_JOB_STARTED_AT"'
-         DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
-         DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-         SPACK_DEPLOYMENT_KEY_PUB: ${{ secrets.SPACK_DEPLOYMENT_KEY_PUB }}
-         SPACK_DEPLOYMENT_KEY_PRIVATE: ${{ secrets.SPACK_DEPLOYMENT_KEY_PRIVATE }}
+          DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
+          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          SPACK_DEPLOYMENT_KEY_PUB: ${{ secrets.SPACK_DEPLOYMENT_KEY_PUB }}
+          SPACK_DEPLOYMENT_KEY_PRIVATE: ${{ secrets.SPACK_DEPLOYMENT_KEY_PRIVATE }}
   spacktainer-build-job:
     runs-on:
       - codebuild-spacktainers-${{ github.run_id }}-${{ github.run_attempt }}
       - image:ubuntu-7.0
       - instance-size:small
-    needs:
-     - base-container-job
+    needs: [base-container-job]
     steps:
       - name: clone repo
         uses: actions/checkout@v4
       - name: prepare to build container
         env:
-         AWS_ECR_URL: ${{ secrets.AWS_ECR_URL }}
+          AWS_ECR_URL: ${{ secrets.AWS_ECR_URL }}
         run: |-
           cd container_definitions/amd64/touchdetector
           cat << EOF > Dockerfile
@@ -86,7 +85,9 @@ jobs:
             --label org.opencontainers.image.source="https://github.com/${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=develop --build-arg CACHE_BUCKET=${{ secrets.AWS_CACHE_BUCKET }} --build-arg MIRROR_AUTH_ARG="--s3-access-key-id=${{ secrets.AWS_CACHE_ACCESS_KEY_ID }} --s3-access-key-secret=${{ secrets.AWS_CACHE_SECRET_ACCESS_KEY }}"
+            SPACK_BRANCH=develop --build-arg CACHE_BUCKET=${{ secrets.AWS_CACHE_BUCKET }}
+            --build-arg MIRROR_AUTH_ARG="--s3-access-key-id=${{ secrets.AWS_CACHE_ACCESS_KEY_ID }}
+            --s3-access-key-secret=${{ secrets.AWS_CACHE_SECRET_ACCESS_KEY }}"
           # ' --label org.opencontainers.image.created="$CI_JOB_STARTED_AT"'
           DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}