From 913d15f6ca56e26ceedc7194ced653607a34597a Mon Sep 17 00:00:00 2001
From: Rauhul Varma <rauhul@apple.com>
Date: Sat, 17 May 2025 09:29:02 -0700
Subject: [PATCH 1/2] Add caching to install-swift

Avoid downloading and installing swift in every workflow run if the
`.swift-version` file hasn't changed.
---
 .github/actions/install-swift/action.yml | 45 ++++++++++++++++--------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/.github/actions/install-swift/action.yml b/.github/actions/install-swift/action.yml
index dc7924a..28591a2 100644
--- a/.github/actions/install-swift/action.yml
+++ b/.github/actions/install-swift/action.yml
@@ -4,16 +4,14 @@ description: Installs the Swift specified by a .swift-version file
 runs:
   using: "composite"
   steps:
-    - name: Install `apt` Dependencies
-      shell: bash
-      run: |
-        SUDO=$(if [[ $EUID -ne 0 ]]; then echo sudo; fi)
-        $SUDO apt-get -qq update
-        $SUDO apt-get -qq -y install curl gpg
-      env:
-        DEBIAN_FRONTEND: noninteractive
+    - name: "Cache: Swift"
+      id: cache-swift
+      uses: actions/cache@v4
+      with:
+        path: "$HOME/.local/share/swiftly"
+        key: swift-${{ hashFiles('.swift-version') }}
 
-    - name: Install Swiftly
+    - name: Setup Environment
       shell: bash
       run: |
         export SWIFTLY_HOME_DIR="$HOME/.local/share/swiftly"
@@ -24,6 +22,23 @@ runs:
         echo "SWIFTLY_BIN_DIR=$SWIFTLY_BIN_DIR" >> $GITHUB_ENV
         echo "SWIFTLY_BIN_DIR=$SWIFTLY_BIN_DIR" >> $HOME/.bashrc
 
+        echo "PATH=$SWIFTLY_BIN_DIR:$PATH" >> $GITHUB_ENV
+        echo "PATH=\$SWIFTLY_BIN_DIR:\$PATH" >> $HOME/.bashrc
+
+    - if: steps.cache-swift.outputs.cache-hit != 'true'
+      name: Install `apt` Dependencies
+      shell: bash
+      run: |
+        SUDO=$(if [[ $EUID -ne 0 ]]; then echo sudo; fi)
+        $SUDO apt-get -qq update
+        $SUDO apt-get -qq -y install curl gpg
+      env:
+        DEBIAN_FRONTEND: noninteractive
+
+    - if: steps.cache-swift.outputs.cache-hit != 'true'
+      name: Install Swiftly
+      shell: bash
+      run: |
         UNAME=$(uname -m)
         curl -O "https://download.swift.org/swiftly/linux/swiftly-$UNAME.tar.gz"
         tar zxf "swiftly-$UNAME.tar.gz"
@@ -33,11 +48,11 @@ runs:
           --quiet-shell-followup \
           --no-modify-profile
 
-        echo "PATH=$SWIFTLY_BIN_DIR:$PATH" >> $GITHUB_ENV
-        echo "PATH=\$SWIFTLY_BIN_DIR:\$PATH" >> $HOME/.bashrc
+    - if: steps.cache-swift.outputs.cache-hit != 'true'
+      name: Install Swift
+      shell: bash
+      run: swiftly install --post-install-file ./out.sh
 
-    - name: Install Swift
+    - name: Print Swift Version
       shell: bash
-      run: |
-        swiftly install --post-install-file ./out.sh
-        swift --version
+      run: swift --version

From ebdffd0cb5cb292a45ba5fb6c1ec620304ce96aa Mon Sep 17 00:00:00 2001
From: Rauhul Varma <rauhul@apple.com>
Date: Sat, 17 May 2025 10:35:09 -0700
Subject: [PATCH 2/2] wip

---
 .github/actions/install-swift/action.yml | 38 ++++++++++++++++--------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/.github/actions/install-swift/action.yml b/.github/actions/install-swift/action.yml
index 28591a2..6ca607f 100644
--- a/.github/actions/install-swift/action.yml
+++ b/.github/actions/install-swift/action.yml
@@ -4,12 +4,12 @@ description: Installs the Swift specified by a .swift-version file
 runs:
   using: "composite"
   steps:
-    - name: "Cache: Swift"
-      id: cache-swift
-      uses: actions/cache@v4
-      with:
-        path: "$HOME/.local/share/swiftly"
-        key: swift-${{ hashFiles('.swift-version') }}
+    # - name: "Cache: Swift"
+    #   id: cache-swift
+    #   uses: actions/cache@v4
+    #   with:
+    #     path: "$HOME/.local/share/swiftly"
+    #     key: swift-${{ hashFiles('.swift-version') }}
 
     - name: Setup Environment
       shell: bash
@@ -25,8 +25,15 @@ runs:
         echo "PATH=$SWIFTLY_BIN_DIR:$PATH" >> $GITHUB_ENV
         echo "PATH=\$SWIFTLY_BIN_DIR:\$PATH" >> $HOME/.bashrc
 
-    - if: steps.cache-swift.outputs.cache-hit != 'true'
-      name: Install `apt` Dependencies
+    - name: "Restore: Swift"
+      uses: actions/cache/restore@v4
+      id: cache-swift
+      with:
+        path: "~/.local/share/swiftly"
+        key: swift-${{ hashFiles('**/.swift-version') }}
+
+    - name: Install `apt` Dependencies
+      if: steps.cache-swift.outputs.cache-hit != 'true'
       shell: bash
       run: |
         SUDO=$(if [[ $EUID -ne 0 ]]; then echo sudo; fi)
@@ -35,8 +42,8 @@ runs:
       env:
         DEBIAN_FRONTEND: noninteractive
 
-    - if: steps.cache-swift.outputs.cache-hit != 'true'
-      name: Install Swiftly
+    - name: Install Swiftly
+      if: steps.cache-swift.outputs.cache-hit != 'true'
       shell: bash
       run: |
         UNAME=$(uname -m)
@@ -48,11 +55,18 @@ runs:
           --quiet-shell-followup \
           --no-modify-profile
 
-    - if: steps.cache-swift.outputs.cache-hit != 'true'
-      name: Install Swift
+    - name: Install Swift
+      if: steps.cache-swift.outputs.cache-hit != 'true'
       shell: bash
       run: swiftly install --post-install-file ./out.sh
 
+    - name: "Save: Swift"
+      if: steps.cache-swift.outputs.cache-hit != 'true'
+      uses: actions/cache/save@v4
+      with:
+        path: "~/.local/share/swiftly"
+        key: swift-${{ hashFiles('**/.swift-version') }}
+
     - name: Print Swift Version
       shell: bash
       run: swift --version