From 231398a0e736ab4893fc7b9448f415a5d9f6991b Mon Sep 17 00:00:00 2001
From: goat <16760685+goaaats@users.noreply.github.com>
Date: Mon, 16 Dec 2024 19:23:40 +0100
Subject: [PATCH] ci: use env var correctly, don't cache extended image anymore

---
 .github/workflows/pull_request_dispatch.yml | 16 ++++++++--------
 .github/workflows/push.yml                  | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/pull_request_dispatch.yml b/.github/workflows/pull_request_dispatch.yml
index cbd5306597..2929496b4d 100644
--- a/.github/workflows/pull_request_dispatch.yml
+++ b/.github/workflows/pull_request_dispatch.yml
@@ -78,13 +78,13 @@ jobs:
         mkdir static
         mkdir work
         
-    - name: Cache docker image
-      uses: actions/cache@v3
-      env:
-        cache-name: ${{ secrets.EXTENDED_IMAGE_LINK }}
-      with:
-        path: ~/.plogon_cache
-        key: cache-${{ env.cache-name }}
+#    - name: Cache docker image
+#      uses: actions/cache@v3
+#      env:
+#        cache-name: ${{ secrets.EXTENDED_IMAGE_LINK }}
+#      with:
+#        path: ~/.plogon_cache
+#        key: cache-${{ env.cache-name }}
 
     - name: Run Plogon
       id: plogon_run
@@ -96,7 +96,7 @@ jobs:
         EXTENDED_IMAGE_LINK: ${{ secrets.EXTENDED_IMAGE_LINK }}
         PLOGON_SECRETS_PK: ${{ secrets.PLOGON_SECRETS_PK }}
         PLOGON_SECRETS_PK_PASSWORD: ${{ secrets.PLOGON_SECRETS_PK_PASSWORD }}
-        PLOGON_INTERNAL_S3_APIURL: $PLOGON_GLADE_APIURL
+        PLOGON_INTERNAL_S3_APIURL: ${{ vars.PLOGON_GLADE_APIURL }}
         PLOGON_INTERNAL_S3_ACCESSKEY: ${{ secrets.PLOGON_GLADE_ACCESSKEY }}
         PLOGON_INTERNAL_S3_SECRET: ${{ secrets.PLOGON_GLADE_SECRET }}
         GITHUB_REPOSITORY: ${{ github.repository }}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 54f380847a..4e8fa0e1f3 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -82,13 +82,13 @@ jobs:
         mkdir artifacts
         mkdir work
         
-    - name: Cache docker image
-      uses: actions/cache@v3
-      env:
-        cache-name: ${{ secrets.EXTENDED_IMAGE_LINK }}
-      with:
-        path: ~/.plogon_cache
-        key: cache-${{ env.cache-name }}
+#    - name: Cache docker image
+#      uses: actions/cache@v3
+#      env:
+#        cache-name: ${{ secrets.EXTENDED_IMAGE_LINK }}
+#      with:
+#        path: ~/.plogon_cache
+#        key: cache-${{ env.cache-name }}
 
     - name: Run Plogon
       working-directory: Plogon/Plogon
@@ -104,7 +104,7 @@ jobs:
         PLOGON_S3_ACCESSKEY: ${{ secrets.PLOGON_S3_ACCESSKEY }}
         PLOGON_S3_SECRET: ${{ secrets.PLOGON_S3_SECRET }}
         PLOGON_S3_REGION: ${{ secrets.PLOGON_S3_REGION }}
-        PLOGON_INTERNAL_S3_APIURL: $PLOGON_GLADE_APIURL
+        PLOGON_INTERNAL_S3_APIURL: ${{ vars.PLOGON_GLADE_APIURL }}
         PLOGON_INTERNAL_S3_ACCESSKEY: ${{ secrets.PLOGON_GLADE_ACCESSKEY }}
         PLOGON_INTERNAL_S3_SECRET: ${{ secrets.PLOGON_GLADE_SECRET }}
       run: |