Combining container jobs again.

monetr · Sep 26, 2021 · 0fcd560 · 0fcd560
1 parent 45ca991
commit 0fcd560
Showing 1 changed file with 8 additions and 22 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -73,29 +73,11 @@ jobs:
         with:
           report_paths: '/junit.xml'
           check_name: 'PostgreSQL Test Summary'
-  timestamp:
-    needs:
-      - "test"
-      - "pg-test"
-    name: Timestamp
-    runs-on: ubuntu-latest
-    steps:
-      - name: Container Timestamp
-        id: timestamp
-        run: echo "::set-output name=build_time::$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
-    outputs:
-      build_time: ${{ steps.timestamp.outputs.build_time }}
   container:
-    timeout-minutes: 45
+    timeout-minutes: 60
     needs:
       - "test"
       - "pg-test"
-      - "timestamp"
-    strategy:
-      matrix:
-        arch:
-          - "linux/amd64"
-          - "linux/arm64"
     name: Container
     runs-on: ubuntu-latest
     steps:
@@ -109,19 +91,23 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Container Timestamp
+        id: timestamp
+        run: echo "::set-output name=build_time::$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v2
         with:
           build-args: |
             REVISION=${{ github.sha }}
-            BUILD_TIME=${{ needs.timestamp.outputs.build_time }}
+            BUILD_TIME=${{ step.timestamp.outputs.build_time }}
           push: true
-          platforms: ${{ matrix.arch }}
+          platforms: "linux/amd64,linux/arm64,linux/arm/v7"
           tags: "ghcr.io/monetr/rest-api:${{ github.sha }}"
   docs-deploy:
     needs:
-      - test
+      - "test"
+      - "pg-test"
     name: Deploy Documentation
     runs-on: ubuntu-latest
     container: ghcr.io/monetr/build-containers/ubuntu:20.04