fix workflows

ls1intum · Dec 25, 2023 · 7950ae3 · 7950ae3
1 parent ad5ce3d
commit 7950ae3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml
@@ -53,6 +53,27 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Compute Tag
+        uses: actions/github-script@v7
+        id: compute-tag
+        with:
+          result-encoding: string
+          script: |
+            if (context.eventName === "pull_request") {
+              return "pr-" + context.issue.number;
+            }
+            if (context.eventName === "release") {
+              return "latest";
+            }
+            if (context.eventName === "push") {
+              if (context.ref.startsWith("refs/tags/")) {
+                return context.ref.slice(10);
+              }
+              if (context.ref === "refs/heads/develop") {
+                return "nightly";
+              }
+            }
+            return "FALSE";
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v4
@@ -63,15 +84,17 @@ jobs:
             type=raw,value={{date 'YYYYMMDD-hhmmss' tz='Europe/Berlin'}}
             type=ref,event=pr
             type=sha
+            type=raw,value={{steps.compute-tag.outputs.result}}
             type=raw,value=nightly,enable={{is_default_branch}}
-
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ${{ matrix.dockerfile }}
           platforms: linux/amd64,linux/arm64
-          push: ${{ github.ref_name == 'develop' }}
+          push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=min
 
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -60,7 +60,9 @@ jobs:
         run: |
           mkdir -p ~/.ssh
           ssh-agent -a $SSH_AUTH_SOCK > /dev/null
+          echo "adding ssh keys 1/2"
           ssh-add - <<< $GATEWAY_SSH_KEY
+          echo "adding ssh keys 2/2"
           ssh-add - <<< $DEPLOYMENT_SSH_KEY
           cat - <<< $GATEWAY_HOST_PUBLIC_KEY >> ~/.ssh/known_hosts
           cat - <<< $(sed 's/\\n/\n/g' <<< "$DEPLOYMENT_HOST_PUBLIC_KEYS") >> ~/.ssh/known_hosts