From c183a86d2b85f947af96f0b4cd9e35ef7791a4b9 Mon Sep 17 00:00:00 2001 From: Gagan Trivedi Date: Mon, 11 Dec 2023 16:06:49 +0530 Subject: [PATCH 1/2] fix: bump rbac to fix import issue --- .github/workflows/api-deploy-production-ecs.yml | 2 +- .github/workflows/api-deploy-staging-ecs.yml | 2 +- .github/workflows/api-tests-with-private-packages.yml | 6 +++++- .../platform-docker-publish-all-features-image.yml | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/api-deploy-production-ecs.yml b/.github/workflows/api-deploy-production-ecs.yml index 1340568b1323..2a82372dc8bf 100644 --- a/.github/workflows/api-deploy-production-ecs.yml +++ b/.github/workflows/api-deploy-production-ecs.yml @@ -39,7 +39,7 @@ jobs: flagsmith_saml_revision: v1.1.0 flagsmith_workflows_revision: v1.2.5 flagsmith_auth_controller_revision: v0.0.1 - flagsmith_rbac_revision: v0.4.1 + flagsmith_rbac_revision: v0.5.0 sse_pgp_private_key: ${{ secrets.SSE_PGP_PRIVATE_KEY }} - name: Deploy task processor to Production diff --git a/.github/workflows/api-deploy-staging-ecs.yml b/.github/workflows/api-deploy-staging-ecs.yml index b0d680f7a303..aab02694291a 100644 --- a/.github/workflows/api-deploy-staging-ecs.yml +++ b/.github/workflows/api-deploy-staging-ecs.yml @@ -40,7 +40,7 @@ jobs: flagsmith_saml_revision: v1.1.0 flagsmith_workflows_revision: v1.2.5 flagsmith_auth_controller_revision: v0.0.1 - flagsmith_rbac_revision: v0.4.1 + flagsmith_rbac_revision: v0.5.0 sse_pgp_private_key: ${{ secrets.SSE_PGP_PRIVATE_KEY }} - name: Deploy task processor to Staging diff --git a/.github/workflows/api-tests-with-private-packages.yml b/.github/workflows/api-tests-with-private-packages.yml index 4c0c54b7b8f6..04bd984a00c3 100644 --- a/.github/workflows/api-tests-with-private-packages.yml +++ b/.github/workflows/api-tests-with-private-packages.yml @@ -1,6 +1,7 @@ name: Run API tests with private package on: + pull_request: merge_group: branches: - main @@ -13,10 +14,13 @@ defaults: working-directory: api env: - FLAGSMITH_RBAC_REVISION: v0.4.1 + FLAGSMITH_RBAC_REVISION: v0.5.0 jobs: test: + # NOTE: we need to include pull_request trigger to trigger `merge_group event + # ref: https://github.com/orgs/community/discussions/51120#discussioncomment-6312578 + if: ${{ github.event_name == 'merge_group' }} runs-on: ubuntu-latest name: API Tests diff --git a/.github/workflows/platform-docker-publish-all-features-image.yml b/.github/workflows/platform-docker-publish-all-features-image.yml index 171b0227af57..854d5069c82a 100644 --- a/.github/workflows/platform-docker-publish-all-features-image.yml +++ b/.github/workflows/platform-docker-publish-all-features-image.yml @@ -7,7 +7,7 @@ on: env: FLAGSMITH_SAML_REVISION: v1.1.0 - FLAGSMITH_RBAC_REVISION: v0.4.1 + FLAGSMITH_RBAC_REVISION: v0.5.0 FLAGSMITH_WORKFLOWS_REVISION: v1.2.5 FLAGSMITH_AUTH_CONTROLLER_REVISION: v0.0.1 From 4c85c46f7234093e4eff4084dcef3a0904214718 Mon Sep 17 00:00:00 2001 From: Gagan Trivedi Date: Mon, 11 Dec 2023 16:12:49 +0530 Subject: [PATCH 2/2] Update .github/workflows/api-tests-with-private-packages.yml Co-authored-by: Matthew Elwell --- .github/workflows/api-tests-with-private-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/api-tests-with-private-packages.yml b/.github/workflows/api-tests-with-private-packages.yml index 04bd984a00c3..3b25203f8e00 100644 --- a/.github/workflows/api-tests-with-private-packages.yml +++ b/.github/workflows/api-tests-with-private-packages.yml @@ -18,7 +18,7 @@ env: jobs: test: - # NOTE: we need to include pull_request trigger to trigger `merge_group event + # NOTE: we need to include pull_request trigger to trigger `merge_group` event # ref: https://github.com/orgs/community/discussions/51120#discussioncomment-6312578 if: ${{ github.event_name == 'merge_group' }} runs-on: ubuntu-latest