From 7c43a865bde8228ff33b0d87defd1efc73e64904 Mon Sep 17 00:00:00 2001 From: nicktrn <55853254+nicktrn@users.noreply.github.com> Date: Tue, 29 Apr 2025 21:09:48 +0100 Subject: [PATCH 1/3] fix entitlement validation when client doesn't exist --- apps/webapp/app/runEngine/validators/triggerTaskValidator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/webapp/app/runEngine/validators/triggerTaskValidator.ts b/apps/webapp/app/runEngine/validators/triggerTaskValidator.ts index cd903d7763..e63bdacfb5 100644 --- a/apps/webapp/app/runEngine/validators/triggerTaskValidator.ts +++ b/apps/webapp/app/runEngine/validators/triggerTaskValidator.ts @@ -46,7 +46,7 @@ export class DefaultTriggerTaskValidator implements TriggerTaskValidator { const result = await getEntitlement(environment.organizationId); - if (!result || result.hasAccess === false) { + if (result && result.hasAccess === false) { return { ok: false, error: new OutOfEntitlementError(), From dafe8f78724007df79efd3b6a86e790c4cbc89ec Mon Sep 17 00:00:00 2001 From: nicktrn <55853254+nicktrn@users.noreply.github.com> Date: Thu, 1 May 2025 23:08:31 +0100 Subject: [PATCH 2/3] add supervisor to publish workflow --- .github/workflows/publish-worker-re2.yml | 16 ++++++++-------- .github/workflows/publish-worker.yml | 16 ++++++++-------- .github/workflows/publish.yml | 7 +++++++ 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/.github/workflows/publish-worker-re2.yml b/.github/workflows/publish-worker-re2.yml index 258af99bb7..bfe429593c 100644 --- a/.github/workflows/publish-worker-re2.yml +++ b/.github/workflows/publish-worker-re2.yml @@ -85,11 +85,11 @@ jobs: REPOSITORY: ${{ steps.get_repository.outputs.repo }} IMAGE_TAG: ${{ steps.get_tag.outputs.tag }} - - name: 🐙 Push 'v3' tag to GitHub Container Registry - if: steps.get_tag.outputs.is_semver == 'true' - run: | - docker tag infra_image "$REGISTRY/$REPOSITORY:v3" - docker push "$REGISTRY/$REPOSITORY:v3" - env: - REGISTRY: ghcr.io/triggerdotdev - REPOSITORY: ${{ steps.get_repository.outputs.repo }} + # - name: 🐙 Push 'v3' tag to GitHub Container Registry + # if: steps.get_tag.outputs.is_semver == 'true' + # run: | + # docker tag infra_image "$REGISTRY/$REPOSITORY:v3" + # docker push "$REGISTRY/$REPOSITORY:v3" + # env: + # REGISTRY: ghcr.io/triggerdotdev + # REPOSITORY: ${{ steps.get_repository.outputs.repo }} diff --git a/.github/workflows/publish-worker.yml b/.github/workflows/publish-worker.yml index 8c0d7ea3c2..74a70d8366 100644 --- a/.github/workflows/publish-worker.yml +++ b/.github/workflows/publish-worker.yml @@ -77,11 +77,11 @@ jobs: REPOSITORY: ${{ steps.get_repository.outputs.repo }} IMAGE_TAG: ${{ steps.get_tag.outputs.tag }} - - name: 🐙 Push 'v3' tag to GitHub Container Registry - if: steps.get_tag.outputs.is_semver == 'true' - run: | - docker tag infra_image "$REGISTRY/$REPOSITORY:v3" - docker push "$REGISTRY/$REPOSITORY:v3" - env: - REGISTRY: ghcr.io/triggerdotdev - REPOSITORY: ${{ steps.get_repository.outputs.repo }} + # - name: 🐙 Push 'v3' tag to GitHub Container Registry + # if: steps.get_tag.outputs.is_semver == 'true' + # run: | + # docker tag infra_image "$REGISTRY/$REPOSITORY:v3" + # docker push "$REGISTRY/$REPOSITORY:v3" + # env: + # REGISTRY: ghcr.io/triggerdotdev + # REPOSITORY: ${{ steps.get_repository.outputs.repo }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ecf30bcc8b..696abadc8c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -68,3 +68,10 @@ jobs: secrets: inherit with: image_tag: ${{ inputs.image_tag }} + + publish-worker-v4: + needs: [typecheck, units] + uses: ./.github/workflows/publish-worker-v4.yml + secrets: inherit + with: + image_tag: ${{ inputs.image_tag }} From 53e150a5159a99e3f23bc5fa5df8bc5092ab6c92 Mon Sep 17 00:00:00 2001 From: nicktrn <55853254+nicktrn@users.noreply.github.com> Date: Fri, 2 May 2025 14:32:40 +0100 Subject: [PATCH 3/3] fix v4 publish workflow name --- .../workflows/{publish-worker-re2.yml => publish-worker-v4.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{publish-worker-re2.yml => publish-worker-v4.yml} (98%) diff --git a/.github/workflows/publish-worker-re2.yml b/.github/workflows/publish-worker-v4.yml similarity index 98% rename from .github/workflows/publish-worker-re2.yml rename to .github/workflows/publish-worker-v4.yml index bfe429593c..ee27e6f862 100644 --- a/.github/workflows/publish-worker-re2.yml +++ b/.github/workflows/publish-worker-v4.yml @@ -1,4 +1,4 @@ -name: "⚒️ Publish Worker RE2" +name: "⚒️ Publish Worker (v4)" on: workflow_call: