From 84fbd980a05fd27c1deaa2906e74d996440c05c5 Mon Sep 17 00:00:00 2001
From: Luisina Santos <luisina.santos@conductorone.com>
Date: Thu, 16 Jul 2026 11:36:07 -0300
Subject: [PATCH 1/3] chore: remove redundant main.yaml CI workflow

main.yaml duplicated the go-lint/go-test jobs already covered by
ci.yaml, just triggered on push to main instead of pull_request.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 .github/workflows/main.yaml | 41 -------------------------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 .github/workflows/main.yaml

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
deleted file mode 100644
index dba9bd2d..00000000
--- a/.github/workflows/main.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: main ci
-on:
-  push:
-    branches:
-      - main
-jobs:
-  go-lint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 1.23.x
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Run linters
-        uses: golangci/golangci-lint-action@v8
-        with:
-          version: latest
-          args: --timeout=3m
-  go-test:
-    strategy:
-      matrix:
-        go-version: [ 1.23.x ]
-        platform: [ ubuntu-latest ]
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - name: Install Go
-        if: success()
-        uses: actions/setup-go@v5
-        with:
-          go-version: ${{ matrix.go-version }}
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: go tests
-        run: (set -o pipefail && go test -v -covermode=count -json ./... | tee test.json)
-      - name: annotate go tests
-        if: always()
-        uses: guyarb/golang-test-annotations@v0.5.1
-        with:
-          test-results: test.json
\ No newline at end of file

From fbaecf2381851536910f00d8c1116b671e67f0a4 Mon Sep 17 00:00:00 2001
From: Luisina Santos <luisina.santos@conductorone.com>
Date: Thu, 16 Jul 2026 11:41:24 -0300
Subject: [PATCH 2/3] chore: restore push-to-main trigger on ci.yaml

main.yaml previously ran go-lint/go-test on push to main; now that
it's removed, ci.yaml picks up that trigger directly. test-cloud-version
stays PR-only since it hits the real GitLab API and wasn't part of
main.yaml's scope.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 .github/workflows/ci.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 73172587..68a3b63a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,6 +1,10 @@
 name: Test Baton Gitlab Integration
 
-on: pull_request
+on:
+  pull_request:
+  push:
+    branches:
+      - main
 
 jobs:
   go-lint:
@@ -190,6 +194,7 @@ jobs:
 #            jq --exit-status ".grants[].principal.id.resource == \"${{ env.USER_ID }}\""
 
   test-cloud-version:
+    if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
     env:
       BATON_LOG_LEVEL: debug

From 0b124ae0ae4d1087989a5bdf23437b5308aa042c Mon Sep 17 00:00:00 2001
From: Mateo Hernandez <mateo.e.2003hernandez@gmail.com>
Date: Fri, 17 Jul 2026 17:57:26 -0300
Subject: [PATCH 3/3] chore(gitlab): remove redundant go-lint/go-test jobs from
 ci.yaml

Per gontzess review: these duplicate the managed verify.yaml (baton-admin),
which already runs lint + test on PRs and push to main. Drop them from ci.yaml
so it keeps only the connector-specific integration test (test-cloud-version);
generic lint/test coverage is unchanged via verify.yaml.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .github/workflows/ci.yaml | 39 ---------------------------------------
 1 file changed, 39 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 68a3b63a..5833501e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -7,45 +7,6 @@ on:
       - main
 
 jobs:
-  go-lint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Install Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: "go.mod"
-      - name: Run linters
-        uses: golangci/golangci-lint-action@v8
-        with:
-          version: latest
-          args: --timeout=3m
-
-  go-test:
-    strategy:
-      matrix:
-        platform: [ubuntu-latest, windows-latest]
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Install Go
-        if: success()
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: "go.mod"
-      - name: go tests
-        run: go test -v -covermode=count -json ./... > test.json
-      - name: Print go test results
-        if: always()
-        run: cat test.json
-      - name: annotate go tests
-        if: always()
-        uses: guyarb/golang-test-annotations@v0.8.0
-        with:
-          test-results: test.json
-
 #  this test is commented because it fails to run due to lack of memory in ci test.
 #  test-DC-version:
 #    runs-on: ubuntu-latest