diff --git a/.github/workflows/check-signed-commits.yaml b/.github/workflows/check-signed-commits.yaml index 4265fe5e1..d0f6e44fd 100644 --- a/.github/workflows/check-signed-commits.yaml +++ b/.github/workflows/check-signed-commits.yaml @@ -1,5 +1,6 @@ name: Check signed commits -on: pull_request_target +on: + pull_request_target: jobs: check-signed-commits: diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0dc2ea76d..ef0998f75 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,6 +3,7 @@ on: pull_request: workflow_call: workflow_dispatch: + merge_group: jobs: build_test: diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml index 7d01493ea..b6a3a407f 100644 --- a/.github/workflows/golangci-lint.yaml +++ b/.github/workflows/golangci-lint.yaml @@ -1,6 +1,7 @@ name: golangci-lint on: pull_request: + merge_group: permissions: contents: read diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index 0e1e2a3e4..1876fa595 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -9,6 +9,7 @@ on: View all available versions at https://github.com/canonical/jimm/pkgs/container/jimm. required: true pull_request: + merge_group: jobs: startjimm: @@ -19,17 +20,17 @@ jobs: uses: actions/checkout@v4 - name: Setup Go - if: ${{ github.event_name == 'pull_request' }} + if: ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }} uses: actions/setup-go@v4 with: go-version-file: 'go.mod' - name: Go vendor to speed up docker build - if: ${{ github.event_name == 'pull_request' }} + if: ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }} run: go mod vendor - name: Start JIMM (pull request) - if: ${{ github.event_name == 'pull_request' }} + if: ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }} uses: ./.github/actions/test-server with: jimm-version: dev diff --git a/internal/jimmhttp/rebac_admin/identities_integration_test.go b/internal/jimmhttp/rebac_admin/identities_integration_test.go index b15165909..769432944 100644 --- a/internal/jimmhttp/rebac_admin/identities_integration_test.go +++ b/internal/jimmhttp/rebac_admin/identities_integration_test.go @@ -130,9 +130,9 @@ func (s *identitiesSuite) TestGetIdentityGroupsWithDeletedDbGroup(c *gc.C) { Relation: ofganames.MemberRelation, } group1Access := baseTuple - group1Access.Target = ofganames.ConvertTag(group1) + group1Access.Target = ofganames.ConvertTag(group1.ResourceTag()) group2Access := baseTuple - group2Access.Target = ofganames.ConvertTag(group2) + group2Access.Target = ofganames.ConvertTag(group2.ResourceTag()) err := s.JIMM.OpenFGAClient.AddRelation(ctx, group1Access, group2Access) c.Assert(err, gc.IsNil)