From c7b4750d13449e13e7b93d86f02e725710f6aff4 Mon Sep 17 00:00:00 2001
From: Alan Chu <ualch9@gmail.com>
Date: Mon, 11 Apr 2022 17:03:26 -0700
Subject: [PATCH 1/2] Update gh and docker containers

---
 .devcontainer/Dockerfile        |  2 +-
 .devcontainer/devcontainer.json |  4 ++--
 .github/workflows/apple.yml     | 12 ++++++------
 .github/workflows/linux.yml     |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 96fefb9..baaf5b1 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
 # [Choice] Swift version: 5.2, 5.1, 4.2
-ARG VARIANT=5.3
+ARG VARIANT=5.6
 FROM swift:${VARIANT}
 
 # [Option] Install zsh
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 0543bbe..1db4d92 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,7 +4,7 @@
 		"dockerfile": "Dockerfile",
 		"args": {
 			// Update the VARIANT arg to pick a Swift version 
-			"VARIANT": "5.2",
+			"VARIANT": "5.6",
 			// Options
 			"INSTALL_NODE": "false",
 			"NODE_VERSION": "lts/*"
@@ -39,4 +39,4 @@
 
 	// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
 	// "remoteUser": "vscode"
-}
\ No newline at end of file
+}
diff --git a/.github/workflows/apple.yml b/.github/workflows/apple.yml
index 22b5018..32d9058 100644
--- a/.github/workflows/apple.yml
+++ b/.github/workflows/apple.yml
@@ -11,9 +11,9 @@ jobs:
   macos:
     runs-on: macos-latest
     steps:
-    - uses: maxim-lobanov/setup-xcode@v1.1
+    - uses: maxim-lobanov/setup-xcode@v1.4.1
       with:
-        xcode-version: 12
+        xcode-version: 13
     - uses: actions/checkout@v2
     - uses: actions/cache@v2
       with:
@@ -29,9 +29,9 @@ jobs:
   ios:
     runs-on: macos-latest
     steps:
-    - uses: maxim-lobanov/setup-xcode@v1.1
+    - uses: maxim-lobanov/setup-xcode@v1.4.1
       with:
-        xcode-version: 12
+        xcode-version: 13
     - uses: actions/checkout@v2
     - uses: actions/cache@v2
       with:
@@ -42,10 +42,10 @@ jobs:
     - name: Build
       run: xcodebuild clean build-for-testing
         -scheme 'NationalWeatherService'
-        -destination 'name=iPhone 11 Pro'
+        -destination 'name=iPhone 13 Pro'
         -quiet
     - name: Unit Test
       run: xcodebuild test-without-building
         -scheme 'NationalWeatherService'
-        -destination 'name=iPhone 11 Pro'
+        -destination 'name=iPhone 13 Pro'
         -quiet
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 0da517a..344a596 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -11,7 +11,7 @@ jobs:
   ubuntu:
     runs-on: ubuntu-latest
     container:
-      image: swift:5.3
+      image: swift:5.6.1
       options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --security-opt apparmor=unconfined
     steps:
       - name: Checkout
@@ -28,7 +28,7 @@ jobs:
   amazonlinux:
     runs-on: ubuntu-latest
     container:
-      image: swift:5.3-amazonlinux2
+      image: swift:5.6.1-amazonlinux2
       options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --security-opt apparmor=unconfined
     steps:
       - name: Checkout

From ce22b267b38c8e65d983e3c50a8f3dae29a9beb6 Mon Sep 17 00:00:00 2001
From: Alan Chu <ualch9@gmail.com>
Date: Mon, 11 Apr 2022 17:11:16 -0700
Subject: [PATCH 2/2] Remove gh actions linux cache

Is causing the entire test to fail, even though unit testing was OK.
---
 .github/workflows/linux.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 344a596..7f992a2 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -16,12 +16,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v1
-      - uses: actions/cache@v2
-        with:
-          path: .build
-          key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
-          restore-keys: |
-            ${{ runner.os }}-spm-
       - name: Build and Test
         run: swift test --enable-test-discovery
 
@@ -33,11 +27,5 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v1
-      - uses: actions/cache@v2
-        with:
-          path: .build
-          key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
-          restore-keys: |
-            ${{ runner.os }}-spm-
       - name: Build and Test
         run: swift test --enable-test-discovery