From 2d50c495ddd7301697ab721061080e5be91ae806 Mon Sep 17 00:00:00 2001 From: Appu Date: Thu, 13 Nov 2025 15:01:59 -0500 Subject: [PATCH 1/7] macos-15 supports running docker again --- .github/workflows/integration-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 54ffbd1c..30cc5d1f 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -17,13 +17,13 @@ jobs: name: PR unit tests strategy: matrix: - os: [ubuntu-latest, macos-12] + os: [ubuntu-latest, macos-latest] fail-fast: false runs-on: ${{ matrix.os }} steps: - name: start docker - if: ${{ matrix.os == 'macos-12' }} + if: ${{ matrix.os == 'macos-latest' }} run: | brew install docker colima start From 5a8e8c19d77ab6df4e41c30ecc50aba5dc2e5d14 Mon Sep 17 00:00:00 2001 From: Appu Date: Thu, 13 Nov 2025 15:04:05 -0500 Subject: [PATCH 2/7] Update integration-tests.yml --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 30cc5d1f..72a3b859 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -25,7 +25,7 @@ jobs: - name: start docker if: ${{ matrix.os == 'macos-latest' }} run: | - brew install docker + brew install docker colima colima start echo "DOCKER_HOST=unix:///Users/runner/.colima/default/docker.sock" >> $GITHUB_ENV From a40fb17f3e138e04009c4f8884f5f8ce12e67321 Mon Sep 17 00:00:00 2001 From: Appu Date: Thu, 13 Nov 2025 15:08:38 -0500 Subject: [PATCH 3/7] Update integration-tests.yml --- .github/workflows/integration-tests.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 72a3b859..fe630502 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -17,17 +17,15 @@ jobs: name: PR unit tests strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-15] fail-fast: false runs-on: ${{ matrix.os }} steps: - name: start docker - if: ${{ matrix.os == 'macos-latest' }} - run: | - brew install docker colima - colima start - echo "DOCKER_HOST=unix:///Users/runner/.colima/default/docker.sock" >> $GITHUB_ENV + if: ${{ matrix.os == 'macos-15' }} + id: setup-docker + uses: douglascamata/setup-docker-macos-action@v1.0.1 - name: Set up Go uses: actions/setup-go@v5 From 8730ac470b862f9da0b3f0d7d626d8c577d7d713 Mon Sep 17 00:00:00 2001 From: Appu Date: Thu, 13 Nov 2025 15:11:39 -0500 Subject: [PATCH 4/7] Update integration-tests.yml --- .github/workflows/integration-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index fe630502..939d2c09 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -17,13 +17,13 @@ jobs: name: PR unit tests strategy: matrix: - os: [ubuntu-latest, macos-15] + os: [ubuntu-latest, macos-13] fail-fast: false runs-on: ${{ matrix.os }} steps: - name: start docker - if: ${{ matrix.os == 'macos-15' }} + if: ${{ matrix.os == 'macos-13' }} id: setup-docker uses: douglascamata/setup-docker-macos-action@v1.0.1 From 74c414f7522eeec4ac892c268b469c54aa645bd8 Mon Sep 17 00:00:00 2001 From: Appu Date: Thu, 13 Nov 2025 15:15:30 -0500 Subject: [PATCH 5/7] Update integration-tests.yml --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 939d2c09..7c444aee 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -25,7 +25,7 @@ jobs: - name: start docker if: ${{ matrix.os == 'macos-13' }} id: setup-docker - uses: douglascamata/setup-docker-macos-action@v1.0.1 + uses: douglascamata/setup-docker-macos-action@v1.0.2 - name: Set up Go uses: actions/setup-go@v5 From d10a7084e86bd54325dac0cd41b82297606062f9 Mon Sep 17 00:00:00 2001 From: Appu Date: Thu, 13 Nov 2025 15:53:31 -0500 Subject: [PATCH 6/7] Update integration-tests.yml --- .github/workflows/integration-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 7c444aee..5394fe8b 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -26,7 +26,7 @@ jobs: if: ${{ matrix.os == 'macos-13' }} id: setup-docker uses: douglascamata/setup-docker-macos-action@v1.0.2 - + - name: Set up Go uses: actions/setup-go@v5 with: @@ -41,5 +41,7 @@ jobs: fetch-depth: 0 - name: Run tests + env: + DOCKER_HOST: unix:///Users/runner/.colima/default/docker.sock run: | make test From 038fe8d1f1bdd8580f482273fae449e9fcedb9db Mon Sep 17 00:00:00 2001 From: Appu Date: Thu, 13 Nov 2025 15:56:29 -0500 Subject: [PATCH 7/7] Update integration-tests.yml --- .github/workflows/integration-tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 5394fe8b..e40a4a35 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -26,6 +26,10 @@ jobs: if: ${{ matrix.os == 'macos-13' }} id: setup-docker uses: douglascamata/setup-docker-macos-action@v1.0.2 + + - name: inject colima docker sock + if: ${{ matrix.os == 'macos-13' }} + run: echo "DOCKER_HOST=unix:///Users/runner/.colima/default/docker.sock" >> $GITHUB_ENV - name: Set up Go uses: actions/setup-go@v5 @@ -41,7 +45,5 @@ jobs: fetch-depth: 0 - name: Run tests - env: - DOCKER_HOST: unix:///Users/runner/.colima/default/docker.sock run: | make test