From 54654709aa5df3dcf3f2932cd108536e93f02f1c Mon Sep 17 00:00:00 2001
From: Marcus Ramberg <marcus@means.no>
Date: Thu, 22 Oct 2026 13:45:58 +0200
Subject: [PATCH 1/2] fix: continue on error for group add

---
 src/github.ts        | 6 +++++-
 tests/github.spec.ts | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/github.ts b/src/github.ts
index 739bb400c..faab2cb51 100644
--- a/src/github.ts
+++ b/src/github.ts
@@ -85,7 +85,11 @@ export async function getTeamMembers(): Promise<Set<string>> {
 
 export async function addUsersToTeam(users: Set<string>): Promise<void> {
   for (const user of users) {
-    await mod.addUserToTeam(user)
+    try {
+      await mod.addUserToTeam(user)
+    } catch (error) {
+      console.error(`Skipping team add for ${user}: ${error instanceof Error ? error.message : String(error)}`)
+    }
   }
 }
 
diff --git a/tests/github.spec.ts b/tests/github.spec.ts
index 5ae1a7be2..48805081e 100644
--- a/tests/github.spec.ts
+++ b/tests/github.spec.ts
@@ -133,6 +133,15 @@ describe('github integration', () => {
     return expect(mod.addUserToTeam).toMatchSnapshot()
   })
 
+  it('addUsersToTeam skips users that error', async () => {
+    const users = new Set(['foo', 'bar'])
+    vi.spyOn(mod, 'addUserToTeam')
+      .mockRejectedValueOnce(new Error('Validation Failed: no_saml_sso'))
+      .mockResolvedValueOnce(false)
+    await expect(mod.addUsersToTeam(users)).resolves.toBeUndefined()
+    expect(mod.addUserToTeam).toHaveBeenCalledTimes(2)
+  })
+
   it('getTeamMembers', async () => {
     const fakeOctokit = {
       teams: { listMembersInOrg: vi.fn() },

From 06df465044b1a1218ea05536064dff0d79d97a2e Mon Sep 17 00:00:00 2001
From: Marcus Ramberg <marcus@means.no>
Date: Thu, 22 Oct 2026 13:46:21 +0200
Subject: [PATCH 2/2] chore: pre-bump to next release

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 1ba1d7098..edd58e723 100644
--- a/action.yml
+++ b/action.yml
@@ -62,7 +62,7 @@ runs:
         -e IGNORED_USERS="$IGNORED_USERS" \
         -e SYNC_TEAM="$SYNC_TEAM" \
         -e GITHUB_TEAM_SLUG="$GITHUB_TEAM_SLUG" \
-        ghcr.io/remarkable/githubusermanager/githubusermanager:v1.5.0
+        ghcr.io/remarkable/githubusermanager/githubusermanager:v1.5.2
       shell: bash
       env:
         GOOGLE_EMAIL_ADDRESS: ${{ inputs.google-email-address }}