Merge pull request #132 from tokens-studio/feat/branch-deploys

Prefer wait over deploy for build

.gimlet/penpot-pr.yaml

@@ -14,7 +14,7 @@ values:
   image:
     pullPolicy: IfNotPresent
     repository: ghcr.io/tokens-studio/tokens-studio-for-penpot
-    tag: 'frontend-{{ .SHA }}'
+    tag: 'frontend-pr-{{ .SHA }}'
   ingress:     
     hosts:
       - host: "{{ .BRANCH | sanitizeDNSName }}.penpot.staging.tokens.studio"

.gimlet/penpot-prod.yaml

@@ -116,7 +116,6 @@ manifests: |
           enabled: true
           annotations:
             cert-manager.io/cluster-issuer: letsencrypt-prod
-            networking.gke.io/v1beta1.FrontendConfig: default-frontend-config
           hosts:
             - host: penpot.tokens.studio
           tls:

.github/workflows/pr.yaml

@@ -12,7 +12,8 @@ jobs:
       matrix:
         include:
           - dockerfile: Dockerfile.frontend
-            type: frontend
+            type: pr-frontend
+            name: frontend
     permissions:
       contents: read
       packages: write
@@ -30,7 +31,7 @@ jobs:
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
-        password: ${{ secrets.GHCR_TOKEN  }}
+        password: ${{ secrets.PAT_TOKEN  }}
 
     - name: Docker meta
       id: meta
@@ -42,9 +43,9 @@ jobs:
           ghcr.io/tokens-studio/tokens-studio-for-penpot
     - name: prebuild
       run: |
-        echo "Building ${{ matrix.type }} image"
+        echo "Building ${{ matrix.name }} image"
-        ./manage.sh build-${{matrix.type}}-bundle
+        ./manage.sh build-${{matrix.name}}-bundle
-        mv ./bundles/${{matrix.type}} ./docker/images/bundle-${{matrix.type}}/
+        mv ./bundles/${{matrix.name}} ./docker/images/bundle-${{matrix.name}}/
 
     - name: Publish Docker images
       uses: docker/build-push-action@v5
@@ -65,5 +66,6 @@ jobs:
       - name: 🍍 Deploy with Gimlet
         uses: gimlet-io/gimlet-artifact-shipper-action@v0.8.3
         env:
-            GIMLET_SERVER: ${{ secrets.GIMLET_SERVER }}
+          GIMLET_SERVER: ${{ secrets.GIMLET_SERVER }}
-            GIMLET_TOKEN: ${{ secrets.GIMLET_TOKEN }}
+          GIMLET_TOKEN: ${{ secrets.GIMLET_TOKEN }}
+          DEPLOY: 'true'

.github/workflows/publish.yml

@@ -31,7 +31,8 @@ jobs:
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
-        password: ${{ secrets.GHCR_TOKEN  }}
+        password: ${{ secrets.PAT_TOKEN  }}
+        
 
     - name: Docker meta
       id: meta
@@ -71,7 +72,7 @@ jobs:
         with:
           ENV: "prod"
           APP: "penpot"
-          DEPLOY: "true"
+          WAIT: "true"
   smoke:
     runs-on: ubuntu-latest
     needs: