From 5131b790604317169820444224456501271eb233 Mon Sep 17 00:00:00 2001 From: SorsOps <80043879+sorsOps@users.noreply.github.com> Date: Thu, 23 May 2024 16:22:31 +0200 Subject: [PATCH 1/6] Prefer wait over deploy for build --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ce86277dc..5c31bd6b5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -71,7 +71,7 @@ jobs: with: ENV: "prod" APP: "penpot" - DEPLOY: "true" + WAIT: "true" smoke: runs-on: ubuntu-latest needs: From d1fc43d8d6e3af528c07547dd9213195c8fe3628 Mon Sep 17 00:00:00 2001 From: SorsOps <80043879+sorsOps@users.noreply.github.com> Date: Mon, 27 May 2024 10:38:35 +0200 Subject: [PATCH 2/6] Try force deploy branch PR --- .github/workflows/pr.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index fdbaa0c15..c4e5fcd98 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -65,5 +65,6 @@ jobs: - name: 🍍 Deploy with Gimlet uses: gimlet-io/gimlet-artifact-shipper-action@v0.8.3 env: - GIMLET_SERVER: ${{ secrets.GIMLET_SERVER }} - GIMLET_TOKEN: ${{ secrets.GIMLET_TOKEN }} \ No newline at end of file + GIMLET_SERVER: ${{ secrets.GIMLET_SERVER }} + GIMLET_TOKEN: ${{ secrets.GIMLET_TOKEN }} + DEPLOY: 'true' \ No newline at end of file From eeb87e49a2e65340e92b990250eef359df7f8123 Mon Sep 17 00:00:00 2001 From: SorsOps <80043879+sorsOps@users.noreply.github.com> Date: Tue, 28 May 2024 09:58:15 +0200 Subject: [PATCH 3/6] Cleanup github token usage --- .github/workflows/pr.yaml | 2 +- .github/workflows/publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index c4e5fcd98..dc23e0bda 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -30,7 +30,7 @@ jobs: with: registry: ghcr.io username: ${{ github.actor }} - password: ${{ secrets.GHCR_TOKEN }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Docker meta id: meta diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5c31bd6b5..085174b85 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -31,7 +31,7 @@ jobs: with: registry: ghcr.io username: ${{ github.actor }} - password: ${{ secrets.GHCR_TOKEN }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Docker meta id: meta From e02777b855ea0ce89483fb506f9a2d469973c9a4 Mon Sep 17 00:00:00 2001 From: SorsOps <80043879+sorsOps@users.noreply.github.com> Date: Tue, 28 May 2024 10:23:20 +0200 Subject: [PATCH 4/6] Be explicit in tagging for prs --- .gimlet/penpot-pr.yaml | 2 +- .github/workflows/pr.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gimlet/penpot-pr.yaml b/.gimlet/penpot-pr.yaml index e53344369..f8cdaaf58 100644 --- a/.gimlet/penpot-pr.yaml +++ b/.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" diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index dc23e0bda..3def786f3 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -12,7 +12,7 @@ jobs: matrix: include: - dockerfile: Dockerfile.frontend - type: frontend + type: pr-frontend permissions: contents: read packages: write From 3b3fbc2ccd9c62d57e316b12e6258150df9e1278 Mon Sep 17 00:00:00 2001 From: SorsOps <80043879+sorsOps@users.noreply.github.com> Date: Tue, 4 Jun 2024 11:06:00 +0200 Subject: [PATCH 5/6] fix deploys --- .gimlet/penpot-prod.yaml | 1 - .github/workflows/pr.yaml | 2 +- .github/workflows/publish.yml | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gimlet/penpot-prod.yaml b/.gimlet/penpot-prod.yaml index f3f84e2ae..bf6ca80cb 100644 --- a/.gimlet/penpot-prod.yaml +++ b/.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: diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 3def786f3..b1a56d72d 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -30,7 +30,7 @@ jobs: with: registry: ghcr.io username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} + password: ${{ secrets.PAT_TOKEN }} - name: Docker meta id: meta diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 085174b85..b278fef22 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -31,7 +31,8 @@ jobs: with: registry: ghcr.io username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} + password: ${{ secrets.PAT_TOKEN }} + - name: Docker meta id: meta From 057934c883bd7b452a816e44d76bdebf558fd06a Mon Sep 17 00:00:00 2001 From: SorsOps <80043879+sorsOps@users.noreply.github.com> Date: Tue, 4 Jun 2024 11:11:58 +0200 Subject: [PATCH 6/6] Cleanup PR --- .github/workflows/pr.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index b1a56d72d..23f9290ec 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -13,6 +13,7 @@ jobs: include: - dockerfile: Dockerfile.frontend type: pr-frontend + name: frontend permissions: contents: read packages: write @@ -42,9 +43,9 @@ jobs: ghcr.io/tokens-studio/tokens-studio-for-penpot - name: prebuild run: | - echo "Building ${{ matrix.type }} image" - ./manage.sh build-${{matrix.type}}-bundle - mv ./bundles/${{matrix.type}} ./docker/images/bundle-${{matrix.type}}/ + echo "Building ${{ matrix.name }} image" + ./manage.sh build-${{matrix.name}}-bundle + mv ./bundles/${{matrix.name}} ./docker/images/bundle-${{matrix.name}}/ - name: Publish Docker images uses: docker/build-push-action@v5