diff --git a/.github/workflows/publish-worker-re2.yml b/.github/workflows/publish-worker-v4.yml similarity index 85% rename from .github/workflows/publish-worker-re2.yml rename to .github/workflows/publish-worker-v4.yml index 258af99bb7..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: @@ -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 }} 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(),