From 2d31f5726f530d453b652fd4ac452bb47a86813c Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Mon, 6 May 2024 10:38:09 -0400
Subject: [PATCH] setup s3 cache for aws

---
 .github/workflows/arrow-aws.yml | 23 +++++++++++++----------
 .github/workflows/arrow.yml     | 10 ----------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/arrow-aws.yml b/.github/workflows/arrow-aws.yml
index 09c5983..969f1df 100644
--- a/.github/workflows/arrow-aws.yml
+++ b/.github/workflows/arrow-aws.yml
@@ -60,22 +60,25 @@ jobs:
       # Install Nix
       - name: Install Nix
         if: inputs.rebuild && inputs.action != 'destroy'
-        uses: cachix/install-nix-action@v17
+        with:
+          extra_nix_config: |
+            substituters = s3://${{ secrets.NIX_CACHE_BUCKET }} https://cache.nixos.org/
+            trusted-public-keys = ${{ secrets.NIX_CACHE_BUCKET }}:KJLT83NgyLjjX+YOJxFNflmw3/IPwW+y21cpgVv+Kwc= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
 
       # Build the image
       - name: Build Image
         if: inputs.rebuild && inputs.action != 'destroy'
         run: nix build .#arrow-aws
 
-      # # Copy the image to S3
-      # - name: Upload Image to Cache
-      #   env:
-      #     NIX_CACHE_PRIVATE_KEY: ${{ secrets.NIX_CACHE_PRIVATE_KEY }}
-      #   run: |
-      #     echo "$NIX_CACHE_PRIVATE_KEY" > cache.key
-      #     nix store sign --key-file cache.key $(readlink result)
-      #     nix copy --to s3://t2-aws-nixos-test $(readlink result)
-      #     rm cache.key
+      # Copy the image to S3
+      - name: Upload Image to Cache
+        env:
+          NIX_CACHE_PRIVATE_KEY: ${{ secrets.NIX_CACHE_PRIVATE_KEY }}
+        run: |
+          echo "$NIX_CACHE_PRIVATE_KEY" > cache.key
+          nix store sign --key-file cache.key $(readlink result)
+          nix copy --to s3://${{ secrets.NIX_CACHE_BUCKET }} $(readlink result)
+          rm cache.key
 
       # Installs the Terraform binary and some other accessory functions.
       - name: Setup Terraform
diff --git a/.github/workflows/arrow.yml b/.github/workflows/arrow.yml
index 85bf9ea..90f0280 100644
--- a/.github/workflows/arrow.yml
+++ b/.github/workflows/arrow.yml
@@ -75,16 +75,6 @@ jobs:
             s3://noahmasur-arrow-images/arrow.iso \
             --endpoint-url "https://${{ env.CLOUDFLARE_R2_ENDPOINT }}"
 
-      # # Copy the image to S3
-      # - name: Upload Image to Cache
-      #   env:
-      #     NIX_CACHE_PRIVATE_KEY: ${{ secrets.NIX_CACHE_PRIVATE_KEY }}
-      #   run: |
-      #     echo "$NIX_CACHE_PRIVATE_KEY" > cache.key
-      #     nix store sign --key-file cache.key $(readlink result)
-      #     nix copy --to s3://t2-aws-nixos-test $(readlink result)
-      #     rm cache.key
-
       # Installs the Terraform binary and some other accessory functions.
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v2