From ca3f659f32ec56d4c036ce561d02b2b443cd2f47 Mon Sep 17 00:00:00 2001
From: Stephen Celis <stephen@stephencelis.com>
Date: Fri, 14 Jun 2024 13:43:46 -0700
Subject: [PATCH] wip

---
 .github/workflows/ci.yml | 35 ++++++++++++++---------------------
 Makefile                 | 24 ------------------------
 2 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e6bb1dde..c1eb335a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,13 +23,22 @@ jobs:
     - name: Run tests
       run: make test
 
-  ubuntu:
-    name: Ubuntu
+  linux:
+    strategy:
+      matrix:
+        swift:
+          - '5.10'
+    name: Ubuntu (Swift ${{ matrix.swift }})
     runs-on: ubuntu-latest
+    container: swift:${{ matrix.swift }}
     steps:
-    - uses: actions/checkout@v4
-    - name: Run tests
-      run: make test-linux
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: sudo apt-get install -y libcurl4-openssl-dev
+      - name: Run tests
+        run: make test
+      - name: Build for static-stdlib
+        run: make build-for-static-stdlib
 
   wasm:
      name: Wasm
@@ -63,19 +72,3 @@ jobs:
         run: swift build -c ${{ matrix.config }}
       - name: Run tests (debug only)
         run: swift test
-
-  static-stdlib:
-    name: Static standard library
-    strategy:
-      matrix:
-        os: [ubuntu-20.04]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: swift-actions/setup-swift@v1
-        with:
-          swift-version: '5.10.0'
-      - name: Install dependencies
-        run: sudo apt-get install -y libcurl4-openssl-dev
-      - uses: actions/checkout@v4
-      - name: Build for static-stdlib
-        run: make build-for-static-stdlib
diff --git a/Makefile b/Makefile
index 8edb5687..c7b698f4 100644
--- a/Makefile
+++ b/Makefile
@@ -14,30 +14,6 @@ test-debug:
 test: test-debug
 	@swift test -c release
 
-test-linux: test-debug
-
-test-linux: test
-
-test-linux-docker:
-	@docker run \
-		--rm \
-		-v "$(PWD):$(PWD)" \
-		-w "$(PWD)" \
-		swift:5.10-focal \
-		bash -c "apt-get update && apt-get install make && make test"
-
-test-linux-static-stdlib:
-	@docker run \
-		-v "$(PWD):$(PWD)" \
-		-w "$(PWD)" \
-		swift:5.10-focal \
-		bash -c "swift build -c debug -Xswiftc -static-stdlib"
-	@docker run \
-		-v "$(PWD):$(PWD)" \
-		-w "$(PWD)" \
-		swift:5.10-focal \
-		bash -c "swift build -c release -Xswiftc -static-stdlib"
-
 build-for-static-stdlib:
 	@swift build -c debug --static-swift-stdlib
 	@swift build -c release --static-swift-stdlib