From f53190838b4a7bdd02724c6996630dbc385070b8 Mon Sep 17 00:00:00 2001 From: Eirik Mo Date: Sun, 14 Apr 2024 12:04:21 +0200 Subject: [PATCH 1/3] Refactor SQL query in JobListPresenter.server.ts to use schema-qualified table name --- .../app/presenters/JobListPresenter.server.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/webapp/app/presenters/JobListPresenter.server.ts b/apps/webapp/app/presenters/JobListPresenter.server.ts index d39accaf73d..ddb0683be92 100644 --- a/apps/webapp/app/presenters/JobListPresenter.server.ts +++ b/apps/webapp/app/presenters/JobListPresenter.server.ts @@ -115,15 +115,15 @@ export class JobListPresenter { }[] >` SELECT * FROM ( - SELECT - "id", - "createdAt", - "status", + SELECT + "id", + "createdAt", + "status", "jobId", ROW_NUMBER() OVER(PARTITION BY "jobId" ORDER BY "createdAt" DESC) as rn - FROM - "JobRun" - WHERE + FROM + "triggerdotdev"."JobRun" + WHERE "jobId" IN (${Prisma.join(jobs.map((j) => j.id))}) ) t WHERE rn = 1;`; From 4b9af95427341ab6dd07675423c18dd79938b4a4 Mon Sep 17 00:00:00 2001 From: Eirik Mo Date: Sun, 14 Apr 2024 12:11:48 +0200 Subject: [PATCH 2/3] Update Docker image repository in publish-docker.yml workflow --- .github/workflows/publish-docker.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index fbb3c2c2fc7..937d3540636 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -1,6 +1,10 @@ name: "🐳 Publish Docker" on: - workflow_call: + push: + branches: + - main + tags: + - v* jobs: publish: runs-on: ubuntu-latest @@ -10,7 +14,7 @@ jobs: steps: - name: Setup Depot CLI uses: depot/setup-action@v1 - + - name: ⬇️ Checkout repo uses: actions/checkout@v3 with: @@ -55,5 +59,5 @@ jobs: file: ./docker/Dockerfile platforms: linux/amd64,linux/arm64 tags: | - ghcr.io/triggerdotdev/trigger.dev:${{ steps.get_version.outputs.version }} + ghcr.io/estubmo/trigger.dev:${{ steps.get_version.outputs.version }} push: true From a3ca2028855f7f96619e6329dd62ea67f84ea25c Mon Sep 17 00:00:00 2001 From: Eirik Mo Date: Sun, 14 Apr 2024 12:20:56 +0200 Subject: [PATCH 3/3] build with GA --- .github/workflows/publish-docker.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 937d3540636..5162b2b364b 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -8,13 +8,13 @@ on: jobs: publish: runs-on: ubuntu-latest + permissions: + contents: read + packages: write outputs: version: ${{ steps.get_version.outputs.version }} short_sha: ${{ steps.get_commit.outputs.sha_short }} steps: - - name: Setup Depot CLI - uses: depot/setup-action@v1 - - name: ⬇️ Checkout repo uses: actions/checkout@v3 with: @@ -54,7 +54,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: 🐳 Build image and push to GitHub Container Registry - uses: depot/build-push-action@v1 + uses: docker/build-push-action@v3 with: file: ./docker/Dockerfile platforms: linux/amd64,linux/arm64