try testcontainers cloud for macos-14

jamesward · Jun 10, 2024 · 09631f1 · 09631f1
1 parent 21b26c2
commit 09631f1
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 19 deletions.
diff --git a/.github/workflows/clients.pkl b/.github/workflows/clients.pkl
@@ -115,19 +115,34 @@ clients = new Mapping<String, Run> {
     steps = GitHubAction.Scala.sbtTestSteps(null, "./scala-zio", null)
   }
 
+  local swiftSteps = new Listing<GitHubAction.Step> {
+    new {
+      uses = "actions/checkout@v4"
+    }
+    new {
+      uses = "atomicjar/testcontainers-cloud-setup-action@v1"
+      with {
+        ["token"] = "${{ secrets.TC_CLOUD_TOKEN }}"
+      }
+    }
+    new {
+      run = "swift test -c release"
+    }
+  }
+
   ["swift-async"] = new {
-    `runs-on` = "macos-latest"
-    steps = GitHubAction.Swift.testSteps()
+    `runs-on` = "macos-14"
+    steps = swiftSteps
   }
 
   ["swift-combine"] = new {
-    `runs-on` = "macos-latest"
-    steps = GitHubAction.Swift.testSteps()
+    `runs-on` = "macos-14"
+    steps = swiftSteps
   }
 
   ["swift-dispatch"] = new {
-    `runs-on` = "macos-latest"
-    steps = GitHubAction.Swift.testSteps()
+    `runs-on` = "macos-14"
+    steps = swiftSteps
   }
 
   ["typescript-effect"] = new {

diff --git a/.github/workflows/elm-worker.yaml b/.github/workflows/elm-worker.yaml
@@ -19,7 +19,7 @@ jobs:
     if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
     steps:
     - uses: actions/checkout@v4
-    - uses: jorelali/setup-elm@v6
+    - uses: jorelali/setup-elm@v5
       with:
         elm-version: 0.19.1
     - run: |-

diff --git a/.github/workflows/python-aiohttp-taskgroup.yaml b/.github/workflows/python-aiohttp-taskgroup.yaml
@@ -19,7 +19,7 @@ jobs:
     if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
     steps:
     - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@V27
+    - uses: cachix/install-nix-action@v26
       with:
         nix_path: nixpkgs=channel:nixpkgs-unstable
         github_access_token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/python-aiohttp.yaml b/.github/workflows/python-aiohttp.yaml
@@ -19,7 +19,7 @@ jobs:
     if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
     steps:
     - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@V27
+    - uses: cachix/install-nix-action@v26
       with:
         nix_path: nixpkgs=channel:nixpkgs-unstable
         github_access_token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/python-httpx-trio.yaml b/.github/workflows/python-httpx-trio.yaml
@@ -19,7 +19,7 @@ jobs:
     if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
     steps:
     - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@V27
+    - uses: cachix/install-nix-action@v26
       with:
         nix_path: nixpkgs=channel:nixpkgs-unstable
         github_access_token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/swift-async.yaml b/.github/workflows/swift-async.yaml
@@ -15,12 +15,13 @@
     - completed
 jobs:
   test:
-    runs-on: macos-latest
+    runs-on: macos-14
     if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
     steps:
     - uses: actions/checkout@v4
-    - name: Setup Docker on macOS
-      uses: douglascamata/setup-docker-macos-action@v1-alpha
+    - uses: atomicjar/testcontainers-cloud-setup-action@v1
+      with:
+        token: ${{ secrets.TC_CLOUD_TOKEN }}
     - run: swift test -c release
     defaults:
       run:

diff --git a/.github/workflows/swift-combine.yaml b/.github/workflows/swift-combine.yaml
@@ -15,12 +15,13 @@
     - completed
 jobs:
   test:
-    runs-on: macos-latest
+    runs-on: macos-14
     if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
     steps:
     - uses: actions/checkout@v4
-    - name: Setup Docker on macOS
-      uses: douglascamata/setup-docker-macos-action@v1-alpha
+    - uses: atomicjar/testcontainers-cloud-setup-action@v1
+      with:
+        token: ${{ secrets.TC_CLOUD_TOKEN }}
     - run: swift test -c release
     defaults:
       run:

diff --git a/.github/workflows/swift-dispatch.yaml b/.github/workflows/swift-dispatch.yaml
@@ -15,12 +15,13 @@
     - completed
 jobs:
   test:
-    runs-on: macos-latest
+    runs-on: macos-14
     if: ${{ github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success' }}
     steps:
     - uses: actions/checkout@v4
-    - name: Setup Docker on macOS
-      uses: douglascamata/setup-docker-macos-action@v1-alpha
+    - uses: atomicjar/testcontainers-cloud-setup-action@v1
+      with:
+        token: ${{ secrets.TC_CLOUD_TOKEN }}
     - run: swift test -c release
     defaults:
       run: