From 56324c2d05816d2b17f6b5efc4c9117d7f95810b Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Tue, 13 Feb 2024 16:25:01 -0700
Subject: [PATCH 01/70] [FIX] Restored action to oasis-deploy

---
 action.yml | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 action.yml

diff --git a/action.yml b/action.yml
new file mode 100644
index 0000000..b779095
--- /dev/null
+++ b/action.yml
@@ -0,0 +1,76 @@
+name: 'Oasis Config Action'
+description: 'Configure env for deploying apps using Oasis'
+inputs:
+  kubeconfig:
+      description: 'A base64 encoded string of the kubeconfig to use. Required!'
+      required: true
+  gitea-token:
+      description: 'Gitea token for downloading repositories'
+      required: true
+  garden-version:
+      description: 'Version of Garden to deploy'
+      required: false
+      default: 0.13.24
+  oasis-branch:
+      description: 'Branch of Oasis to use'
+      required: false
+      default: master
+  oasis-workspace: 
+      descipriont: 'Workspace to setup Oasis'
+      required: false
+      default: ${{ gitea.workspace}}/oasis
+runs:
+  using: "composite"
+  steps:
+    # Set additional Envars
+    - name: Setting Short Commit Sha
+      run: echo SHORT_COMMIT_SHA=$(echo $GITHUB_SHA | cut -c 1-6) >> $GITHUB_ENV
+    - name: Setup Enviornment Variables
+      run: |
+        echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
+        echo REPO_GITEA_TOKEN_RO=$GITEA_TOKEN >> $GITHUB_ENV        
+      env:
+        GITEA_TOKEN: ${{ inputs.gitea-token }}
+    # Checkout Oasis 
+    - name: Checkout Oasis
+      uses: actions/checkout@v3
+      with:
+        repository: "elysium/oasis"
+        path: ${{ inputs.oasis-workspace }}
+        token: ${{ inputs.gitea-token}}
+        ref: ${{ inputs.oasis-branch }}
+    - name: Download Garden
+      shell: bash
+      env:
+        GARDEN_BIN_VERSION: ${{ inputs.garden-version }}
+        GARDEN_DIR: ${{ runner.temp }}/garden
+      run: |
+        # Install Garden
+        mkdir -p "$GARDEN_DIR"
+        cd "$GARDEN_DIR"
+        if ! [ -d "$GARDEN_BIN_VERSION" ]; then
+          echo "Downloading ${GARDEN_BIN_VERSION}..."
+          if [[ "$GARDEN_BIN_VERSION" = "latest" ]]; then
+            tag_param=""
+          else
+            tag_param="$GARDEN_BIN_VERSION"
+          fi
+        fi
+         curl -sL https://get.garden.io/install.sh | bash -s -- $tag_param
+         echo PATH=$PATH:$HOME/.garden/bin >> $GITHUB_ENV
+         git config --global --add safe.directory $HOME/.garden/bin/static        
+    # Configure K&S
+    - name: Configure K8S
+      run: |
+        echo "Setup kubeconfig"
+        mkdir -p ~/.kube &&
+        echo "${KUBECONFIG_BASE64}" | base64 -d  > ~/.kube/config &&
+        chmod 700 ~/.kube/config        
+      env:
+        KUBECONFIG_BASE64: ${{ inputs.kubeconfig }}
+    - name: Export Envars
+      shell: bash
+      run: |
+        # Export environment variables
+        echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
+

From 3dbcf39eceed60e8ff37e05b5eea26dcaefee4bd Mon Sep 17 00:00:00 2001
From: dunemask <elijah@dunemask.net>
Date: Tue, 13 Feb 2024 23:32:53 +0000
Subject: [PATCH 02/70] Update README.md

---
 README.md | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 87f9314..e4fd7c2 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,40 @@
 # Elysium Actions
 ## About
-The actions are used by Elysium to run CI/CD tasks and this repo will be archived once Gitea supports private actions (See issue [Here](https://github.com/go-gitea/gitea/issues/24621) )
+The actions are used by Elysium to run CI/CD tasks and this repo will be archived once Gitea supports private actions (See issue [Here](https://github.com/go-gitea/gitea/issues/24621))
+
+## Actions
+
+The actions available are: 
+- [S3 Backup](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/s3-backup/action.yml)
+- [Oasis Deploy](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/oasis-deploy/action.yml)
+- [Infisical Env](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/infisical-env/action.yml)
+- [Elysium CI/CD](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/elysium-ci-cd/action.yml)
+
+## Workflow Template
+
+The example below demonstrates how to use the [oasis-deploy](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/oasis-deploy/action.yml) action.
+
+```yml
+name: Deploy Edge
+run-name: ${{ gitea.actor }} Deploy Edge
+on:
+ push:
+   branches: [ master ]
+
+env:
+  GITEA_TOKEN: ${{ secrets.ELYSIUM_ORG_READ_TOKEN }}
+  KUBECONFIG_BASE64: ${{ secrets.KUBECONFIG_USW_EDGE }}
+  GARDEN_DEPLOY_ACTION: nile
+
+jobs:
+  deploy-edge:
+    steps:
+    - name: Oasis Setup
+      uses: https://gitea.dunemask.dev/elysium/elysium-actions@oasis-deploy
+      with:
+        gitea-token: ${{ env.GITEA_TOKEN }}
+        kubeconfig: ${{ env.KUBECONFIG_BASE64 }}
+    - name: Deploy to Edge env
+      run: garden deploy $GARDEN_DEPLOY_ACTION --force --force-build --env usw-edge
+      working-directory: ${{ env.OASIS_WORKSPACE }}
+```

From 1e632a3f91b0a7425d14ea8a85af19dab19fd819 Mon Sep 17 00:00:00 2001
From: dunemask <elijah@dunemask.net>
Date: Tue, 13 Feb 2024 23:32:53 +0000
Subject: [PATCH 03/70] Update README.md

---
 README.md | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 87f9314..e4fd7c2 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,40 @@
 # Elysium Actions
 ## About
-The actions are used by Elysium to run CI/CD tasks and this repo will be archived once Gitea supports private actions (See issue [Here](https://github.com/go-gitea/gitea/issues/24621) )
+The actions are used by Elysium to run CI/CD tasks and this repo will be archived once Gitea supports private actions (See issue [Here](https://github.com/go-gitea/gitea/issues/24621))
+
+## Actions
+
+The actions available are: 
+- [S3 Backup](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/s3-backup/action.yml)
+- [Oasis Deploy](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/oasis-deploy/action.yml)
+- [Infisical Env](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/infisical-env/action.yml)
+- [Elysium CI/CD](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/elysium-ci-cd/action.yml)
+
+## Workflow Template
+
+The example below demonstrates how to use the [oasis-deploy](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/oasis-deploy/action.yml) action.
+
+```yml
+name: Deploy Edge
+run-name: ${{ gitea.actor }} Deploy Edge
+on:
+ push:
+   branches: [ master ]
+
+env:
+  GITEA_TOKEN: ${{ secrets.ELYSIUM_ORG_READ_TOKEN }}
+  KUBECONFIG_BASE64: ${{ secrets.KUBECONFIG_USW_EDGE }}
+  GARDEN_DEPLOY_ACTION: nile
+
+jobs:
+  deploy-edge:
+    steps:
+    - name: Oasis Setup
+      uses: https://gitea.dunemask.dev/elysium/elysium-actions@oasis-deploy
+      with:
+        gitea-token: ${{ env.GITEA_TOKEN }}
+        kubeconfig: ${{ env.KUBECONFIG_BASE64 }}
+    - name: Deploy to Edge env
+      run: garden deploy $GARDEN_DEPLOY_ACTION --force --force-build --env usw-edge
+      working-directory: ${{ env.OASIS_WORKSPACE }}
+```

From 881621c35c5e07b2be7f041fabedcbb4f2fe88b5 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Tue, 13 Feb 2024 16:49:46 -0700
Subject: [PATCH 04/70] [FEATURE] S3 Action

---
 action.yml | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 action.yml

diff --git a/action.yml b/action.yml
new file mode 100644
index 0000000..72bc359
--- /dev/null
+++ b/action.yml
@@ -0,0 +1,41 @@
+name: "S3 Backup Action"
+description: "Backup to S3 Bucket"
+inputs:
+  s3-backup-endpoint:
+    description: "S3 Backup Endpoint"
+    required: false 
+    default: ${{ secrets.S3_BACKUP_ENDPOINT }}
+  s3-backup-key-id:
+    description: "S3 Backup Access Key ID"
+    required: false
+    default: ${{ secrets.S3_BACKUP_KEY_ID}}
+  s3-backup-key:
+    description: "S3 Backup Access Key"
+    required: false
+    default: ${{ secrets.S3_BACKUP_KEY}}
+  s3-backup-path: 
+    description: "Workspace to setup Oasis"
+    required: false
+    default: backups/gitea-repositories/${{ gitea.repository }}
+  repository-dir:
+    description: "Directory to clone the Repository to"
+    required: false
+    default: ${{ gitea.workspace }}/repo
+runs:
+  using: "composite"
+  steps:
+    # Checkout Repository
+    - name: Checkout Repository
+      uses: actions/checkout@v3
+      with:
+        path: ${{ inputs.repository-dir }}
+    - name: S3 Backup
+      uses: peter-evans/s3-backup@v1
+      env:
+        STORAGE_SERVICE_URL: ${{ inputs.s3-backup-endpoint }}
+        ACCESS_KEY_ID: ${{ inputs.s3-backup-key-id }}
+        SECRET_ACCESS_KEY: ${{ inputs.s3-backup-key }}        
+        MIRROR_TARGET: ${{ inputs.s3-backup-path }}
+        MIRROR_SOURCE: ${{ inputs.repository-dir }}
+      with:
+        args: --overwrite --remove

From f80938e7fab141067e6447057aec4bbbfbeee26b Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Tue, 13 Feb 2024 23:46:09 -0700
Subject: [PATCH 05/70] [FEATURE] Oasis Action

---
 action.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/action.yml b/action.yml
index b779095..265e640 100644
--- a/action.yml
+++ b/action.yml
@@ -6,7 +6,8 @@ inputs:
       required: true
   gitea-token:
       description: 'Gitea token for downloading repositories'
-      required: true
+      required: false
+      default: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN }}
   garden-version:
       description: 'Version of Garden to deploy'
       required: false
@@ -28,9 +29,7 @@ runs:
     - name: Setup Enviornment Variables
       run: |
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
-        echo REPO_GITEA_TOKEN_RO=$GITEA_TOKEN >> $GITHUB_ENV        
-      env:
-        GITEA_TOKEN: ${{ inputs.gitea-token }}
+        echo DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN=${{ inputs.gitea-token }} >> $GITHUB_ENV        
     # Checkout Oasis 
     - name: Checkout Oasis
       uses: actions/checkout@v3

From 72a9c62af4050bca197a61f705fbba9f17385491 Mon Sep 17 00:00:00 2001
From: dunemask <elijah@dunemask.net>
Date: Thu, 15 Feb 2024 03:04:35 +0000
Subject: [PATCH 06/70] [DEBUG] Action Debugging

---
 action.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 265e640..f8cf774 100644
--- a/action.yml
+++ b/action.yml
@@ -29,7 +29,8 @@ runs:
     - name: Setup Enviornment Variables
       run: |
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
-        echo DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN=${{ inputs.gitea-token }} >> $GITHUB_ENV        
+        echo DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN=${{ inputs.gitea-token }} >> $GITHUB_ENV
+        echo "GITEA TOKEN '${{ inputs.gitea-token }}'"        
     # Checkout Oasis 
     - name: Checkout Oasis
       uses: actions/checkout@v3

From dbf8182e818f1ffbbf1684f3864c3e6cd9fcb755 Mon Sep 17 00:00:00 2001
From: dunemask <elijah@dunemask.net>
Date: Thu, 15 Feb 2024 03:18:12 +0000
Subject: [PATCH 07/70] Update action.yml

---
 action.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/action.yml b/action.yml
index f8cf774..0512a83 100644
--- a/action.yml
+++ b/action.yml
@@ -7,7 +7,7 @@ inputs:
   gitea-token:
       description: 'Gitea token for downloading repositories'
       required: false
-      default: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN }}
+      # default: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN }} # Action can't read this as a default, so we've gotta do a check later
   garden-version:
       description: 'Version of Garden to deploy'
       required: false
@@ -29,8 +29,11 @@ runs:
     - name: Setup Enviornment Variables
       run: |
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
-        echo DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN=${{ inputs.gitea-token }} >> $GITHUB_ENV
-        echo "GITEA TOKEN '${{ inputs.gitea-token }}'"        
+        if [ ! -z "${{ inputs.gitea-token }}" -a "${{ inputs.gitea-token }}" != " " ]; then
+          echo DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN=${{ inputs.gitea-token }} >> $GITHUB_ENV
+        fi
+        echo "GITEA TOKEN '${{ inputs.gitea-token }}'"
+        echo "ENV_TOKEN $DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN"        
     # Checkout Oasis 
     - name: Checkout Oasis
       uses: actions/checkout@v3

From a704cbfd10d3d4f85d378a6f28efd4b5c908ae82 Mon Sep 17 00:00:00 2001
From: dunemask <elijah@dunemask.net>
Date: Thu, 15 Feb 2024 03:19:39 +0000
Subject: [PATCH 08/70] Update action.yml

---
 action.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index 0512a83..f3ecae1 100644
--- a/action.yml
+++ b/action.yml
@@ -30,10 +30,12 @@ runs:
       run: |
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
         if [ ! -z "${{ inputs.gitea-token }}" -a "${{ inputs.gitea-token }}" != " " ]; then
+          echo "NOT EMPTY ${{ inputs.gitea-token}}"
+          echo "GITEA TOKEN '${{ inputs.gitea-token }}'"
+          echo "ENV_TOKEN $DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN"  
           echo DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN=${{ inputs.gitea-token }} >> $GITHUB_ENV
         fi
-        echo "GITEA TOKEN '${{ inputs.gitea-token }}'"
-        echo "ENV_TOKEN $DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN"        
+      
     # Checkout Oasis 
     - name: Checkout Oasis
       uses: actions/checkout@v3

From e7920efd4203553c09f08acec58eb34c0e12215f Mon Sep 17 00:00:00 2001
From: dunemask <elijah@dunemask.net>
Date: Thu, 15 Feb 2024 03:23:43 +0000
Subject: [PATCH 09/70] Update action.yml

---
 action.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/action.yml b/action.yml
index f3ecae1..0e71a05 100644
--- a/action.yml
+++ b/action.yml
@@ -30,9 +30,6 @@ runs:
       run: |
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
         if [ ! -z "${{ inputs.gitea-token }}" -a "${{ inputs.gitea-token }}" != " " ]; then
-          echo "NOT EMPTY ${{ inputs.gitea-token}}"
-          echo "GITEA TOKEN '${{ inputs.gitea-token }}'"
-          echo "ENV_TOKEN $DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN"  
           echo DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN=${{ inputs.gitea-token }} >> $GITHUB_ENV
         fi
       
@@ -42,7 +39,7 @@ runs:
       with:
         repository: "elysium/oasis"
         path: ${{ inputs.oasis-workspace }}
-        token: ${{ inputs.gitea-token}}
+        token: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN }}
         ref: ${{ inputs.oasis-branch }}
     - name: Download Garden
       shell: bash

From b59a89cf52fe2d2adf48ba8db84d97b4fae0ce40 Mon Sep 17 00:00:00 2001
From: dunemask <elijah@dunemask.net>
Date: Thu, 15 Feb 2024 03:24:29 +0000
Subject: [PATCH 10/70] Update action.yml

---
 action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/action.yml b/action.yml
index 0e71a05..44128f3 100644
--- a/action.yml
+++ b/action.yml
@@ -30,6 +30,7 @@ runs:
       run: |
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
         if [ ! -z "${{ inputs.gitea-token }}" -a "${{ inputs.gitea-token }}" != " " ]; then
+          echo "Somehow setting? ${{ inputs.gitea-token }}"
           echo DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN=${{ inputs.gitea-token }} >> $GITHUB_ENV
         fi
       

From fec0d92bbe27e3839e590e37f2672c0e87b611a3 Mon Sep 17 00:00:00 2001
From: dunemask <elijah@dunemask.net>
Date: Thu, 15 Feb 2024 03:26:01 +0000
Subject: [PATCH 11/70] Update action.yml

---
 action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/action.yml b/action.yml
index 44128f3..7e54938 100644
--- a/action.yml
+++ b/action.yml
@@ -33,6 +33,7 @@ runs:
           echo "Somehow setting? ${{ inputs.gitea-token }}"
           echo DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN=${{ inputs.gitea-token }} >> $GITHUB_ENV
         fi
+        echo "Ans so I CRI sometimes cuz I got right here and I echo this var '$DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN'"
       
     # Checkout Oasis 
     - name: Checkout Oasis

From a4697b265515fb0747331e4186bb67d2dfea15c4 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Wed, 14 Feb 2024 20:41:56 -0700
Subject: [PATCH 12/70] [DEBUG] Debug

---
 action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/action.yml b/action.yml
index 7e54938..d9a9852 100644
--- a/action.yml
+++ b/action.yml
@@ -28,6 +28,7 @@ runs:
       run: echo SHORT_COMMIT_SHA=$(echo $GITHUB_SHA | cut -c 1-6) >> $GITHUB_ENV
     - name: Setup Enviornment Variables
       run: |
+       echo "OLD: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN  }}"
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
         if [ ! -z "${{ inputs.gitea-token }}" -a "${{ inputs.gitea-token }}" != " " ]; then
           echo "Somehow setting? ${{ inputs.gitea-token }}"

From 3d7e62eb3099e7496f9dc20031c839613811202f Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Wed, 14 Feb 2024 20:43:59 -0700
Subject: [PATCH 13/70] [DEBUG] Debug

---
 action.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index d9a9852..a6e715e 100644
--- a/action.yml
+++ b/action.yml
@@ -27,6 +27,7 @@ runs:
     - name: Setting Short Commit Sha
       run: echo SHORT_COMMIT_SHA=$(echo $GITHUB_SHA | cut -c 1-6) >> $GITHUB_ENV
     - name: Setup Enviornment Variables
+      shell: bash
       run: |
        echo "OLD: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN  }}"
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
@@ -35,7 +36,9 @@ runs:
           echo DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN=${{ inputs.gitea-token }} >> $GITHUB_ENV
         fi
         echo "Ans so I CRI sometimes cuz I got right here and I echo this var '$DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN'"
-      
+    - name: See envars
+      shell: bash
+      run: echo $DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN
     # Checkout Oasis 
     - name: Checkout Oasis
       uses: actions/checkout@v3

From 6b1260fa4b1ea452031c1e1c29828c49a97dffd6 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Wed, 14 Feb 2024 20:45:13 -0700
Subject: [PATCH 14/70] [DEBUG] Debug

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index a6e715e..b70c43b 100644
--- a/action.yml
+++ b/action.yml
@@ -7,7 +7,7 @@ inputs:
   gitea-token:
       description: 'Gitea token for downloading repositories'
       required: false
-      # default: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN }} # Action can't read this as a default, so we've gotta do a check later
+      default: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN }} # Action can't read this as a default, so we've gotta do a check later
   garden-version:
       description: 'Version of Garden to deploy'
       required: false

From c021ec21ba98806b241a36524e3b67129c59a36d Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Wed, 14 Feb 2024 20:46:00 -0700
Subject: [PATCH 15/70] [DEBUG] Debug

---
 action.yml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/action.yml b/action.yml
index b70c43b..82b0ca3 100644
--- a/action.yml
+++ b/action.yml
@@ -29,16 +29,9 @@ runs:
     - name: Setup Enviornment Variables
       shell: bash
       run: |
-       echo "OLD: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN  }}"
+        echo "OLD: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN  }}"
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
-        if [ ! -z "${{ inputs.gitea-token }}" -a "${{ inputs.gitea-token }}" != " " ]; then
-          echo "Somehow setting? ${{ inputs.gitea-token }}"
-          echo DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN=${{ inputs.gitea-token }} >> $GITHUB_ENV
-        fi
-        echo "Ans so I CRI sometimes cuz I got right here and I echo this var '$DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN'"
-    - name: See envars
-      shell: bash
-      run: echo $DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN
+        echo DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN=${{ inputs.gitea-token }} >> $GITHUB_ENV
     # Checkout Oasis 
     - name: Checkout Oasis
       uses: actions/checkout@v3

From cb90f85f92cf515efbb2e5c2993e0e0206326549 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Wed, 14 Feb 2024 21:08:40 -0700
Subject: [PATCH 16/70] [DEBUG] Debug

---
 action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index 82b0ca3..857de6d 100644
--- a/action.yml
+++ b/action.yml
@@ -7,7 +7,7 @@ inputs:
   gitea-token:
       description: 'Gitea token for downloading repositories'
       required: false
-      default: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN }} # Action can't read this as a default, so we've gotta do a check later
+      default: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN }} # Action can't read env, so we need to reset it later
   garden-version:
       description: 'Version of Garden to deploy'
       required: false
@@ -29,7 +29,7 @@ runs:
     - name: Setup Enviornment Variables
       shell: bash
       run: |
-        echo "OLD: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN  }}"
+        env
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
         echo DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN=${{ inputs.gitea-token }} >> $GITHUB_ENV
     # Checkout Oasis 

From 6f64a8a9ffb0b9c821e209b843edf9f3ee3d822d Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Wed, 14 Feb 2024 21:24:22 -0700
Subject: [PATCH 17/70] [DEBUG] Debug

---
 action.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/action.yml b/action.yml
index 857de6d..08fe85b 100644
--- a/action.yml
+++ b/action.yml
@@ -29,6 +29,8 @@ runs:
     - name: Setup Enviornment Variables
       shell: bash
       run: |
+        echo "PARENT GOT ENV ^^^^"
+        echo "GOT ENV BELOW vvvv"
         env
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
         echo DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN=${{ inputs.gitea-token }} >> $GITHUB_ENV

From 7cbaae0be335f7cd4a13fb103770103c4cfde52a Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Wed, 14 Feb 2024 21:27:53 -0700
Subject: [PATCH 18/70] [DEBUG] Debug

---
 action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/action.yml b/action.yml
index 08fe85b..d413241 100644
--- a/action.yml
+++ b/action.yml
@@ -65,6 +65,7 @@ runs:
     # Configure K&S
     - name: Configure K8S
       run: |
+        echo ${{ inputs.kubeconfig }}
         echo "Setup kubeconfig"
         mkdir -p ~/.kube &&
         echo "${KUBECONFIG_BASE64}" | base64 -d  > ~/.kube/config &&

From 08b815286f483fe67a7bd5365afe0b25993a4d23 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Wed, 14 Feb 2024 21:36:48 -0700
Subject: [PATCH 19/70] [DEBUG] Debug

---
 action.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/action.yml b/action.yml
index d413241..a7c98c1 100644
--- a/action.yml
+++ b/action.yml
@@ -66,6 +66,8 @@ runs:
     - name: Configure K8S
       run: |
         echo ${{ inputs.kubeconfig }}
+        echo "-----"
+        echo "${KUBECONFIG_BASE64}"
         echo "Setup kubeconfig"
         mkdir -p ~/.kube &&
         echo "${KUBECONFIG_BASE64}" | base64 -d  > ~/.kube/config &&

From e8f5a00cef09e744a8e80c0b928b089d7585270e Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Wed, 14 Feb 2024 21:38:04 -0700
Subject: [PATCH 20/70] [DEBUG] Debug

---
 action.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/action.yml b/action.yml
index a7c98c1..8fcf565 100644
--- a/action.yml
+++ b/action.yml
@@ -65,15 +65,10 @@ runs:
     # Configure K&S
     - name: Configure K8S
       run: |
-        echo ${{ inputs.kubeconfig }}
-        echo "-----"
-        echo "${KUBECONFIG_BASE64}"
         echo "Setup kubeconfig"
         mkdir -p ~/.kube &&
-        echo "${KUBECONFIG_BASE64}" | base64 -d  > ~/.kube/config &&
+        echo ${{ inputs.kubeconfig }} | base64 -d  > ~/.kube/config &&
         chmod 700 ~/.kube/config        
-      env:
-        KUBECONFIG_BASE64: ${{ inputs.kubeconfig }}
     - name: Export Envars
       shell: bash
       run: |

From 636bb98d2fbe34563882b3e027bcd5852214fa4f Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Wed, 14 Feb 2024 21:40:14 -0700
Subject: [PATCH 21/70] [FIX] Fixed Oasis

---
 action.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/action.yml b/action.yml
index 8fcf565..b371dad 100644
--- a/action.yml
+++ b/action.yml
@@ -29,11 +29,9 @@ runs:
     - name: Setup Enviornment Variables
       shell: bash
       run: |
-        echo "PARENT GOT ENV ^^^^"
-        echo "GOT ENV BELOW vvvv"
-        env
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
         echo DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN=${{ inputs.gitea-token }} >> $GITHUB_ENV
+        echo "Checking out Oasis"
     # Checkout Oasis 
     - name: Checkout Oasis
       uses: actions/checkout@v3
@@ -62,13 +60,15 @@ runs:
          curl -sL https://get.garden.io/install.sh | bash -s -- $tag_param
          echo PATH=$PATH:$HOME/.garden/bin >> $GITHUB_ENV
          git config --global --add safe.directory $HOME/.garden/bin/static        
+         echo "Finished intalling Garden!"
     # Configure K&S
     - name: Configure K8S
       run: |
         echo "Setup kubeconfig"
         mkdir -p ~/.kube &&
         echo ${{ inputs.kubeconfig }} | base64 -d  > ~/.kube/config &&
-        chmod 700 ~/.kube/config        
+        chmod 700 ~/.kube/config
+        echo "Finished setting up kubeconfig"
     - name: Export Envars
       shell: bash
       run: |

From 26eff76d906f57cca7a7ca75343dbeb4aca60583 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 19:09:47 -0700
Subject: [PATCH 22/70] [FEATURE] Initial S3 Concept

---
 action.yml | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/action.yml b/action.yml
index 72bc359..f7c0525 100644
--- a/action.yml
+++ b/action.yml
@@ -1,26 +1,13 @@
 name: "S3 Backup Action"
 description: "Backup to S3 Bucket"
 inputs:
-  s3-backup-endpoint:
-    description: "S3 Backup Endpoint"
-    required: false 
-    default: ${{ secrets.S3_BACKUP_ENDPOINT }}
-  s3-backup-key-id:
-    description: "S3 Backup Access Key ID"
-    required: false
-    default: ${{ secrets.S3_BACKUP_KEY_ID}}
-  s3-backup-key:
-    description: "S3 Backup Access Key"
-    required: false
-    default: ${{ secrets.S3_BACKUP_KEY}}
+  infisical-token:
+    description: Infisical token for backup envars
+    required: true
   s3-backup-path: 
     description: "Workspace to setup Oasis"
     required: false
     default: backups/gitea-repositories/${{ gitea.repository }}
-  repository-dir:
-    description: "Directory to clone the Repository to"
-    required: false
-    default: ${{ gitea.workspace }}/repo
 runs:
   using: "composite"
   steps:
@@ -28,14 +15,21 @@ runs:
     - name: Checkout Repository
       uses: actions/checkout@v3
       with:
-        path: ${{ inputs.repository-dir }}
+        path: ${{ gitea.workspace }}/repo
+    # Load Backup Envars
+    - name: Setup Backup Envars
+      uses: https://gitea.dunemask.dev/elysium/elysium-actions@infisical-env
+      with:
+        infisical-token: ${{ inputs.infisical-token }}
+        secret-envs: edge
+        secret-paths: /devops/gitea-backups
     - name: S3 Backup
       uses: peter-evans/s3-backup@v1
       env:
-        STORAGE_SERVICE_URL: ${{ inputs.s3-backup-endpoint }}
-        ACCESS_KEY_ID: ${{ inputs.s3-backup-key-id }}
-        SECRET_ACCESS_KEY: ${{ inputs.s3-backup-key }}        
+        STORAGE_SERVICE_URL: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_S3_ENDPOINT }}
+        ACCESS_KEY_ID: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_S3_KEY_ID }}
+        SECRET_ACCESS_KEY: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_S3_KEY }}        
         MIRROR_TARGET: ${{ inputs.s3-backup-path }}
-        MIRROR_SOURCE: ${{ inputs.repository-dir }}
+        MIRROR_SOURCE: ${{ gitea.workspace }}/repo
       with:
         args: --overwrite --remove

From 7b513727bb6fa2e0942dfa69d33093047b4ad64a Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 19:24:18 -0700
Subject: [PATCH 23/70] [FEATURE] S3 Fix

---
 action.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index f7c0525..8cf974a 100644
--- a/action.yml
+++ b/action.yml
@@ -23,10 +23,12 @@ runs:
         infisical-token: ${{ inputs.infisical-token }}
         secret-envs: edge
         secret-paths: /devops/gitea-backups
+    - name: Fix Endpoint Format
+      run: echo BACKUP_S3_ENDPOINT=${{ env.DEVOPS_GITEA_ELYSIUM_ORG_S3_ENDPOINT }} >> $GITHUB_ENV
     - name: S3 Backup
       uses: peter-evans/s3-backup@v1
       env:
-        STORAGE_SERVICE_URL: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_S3_ENDPOINT }}
+        STORAGE_SERVICE_URL: ${{ env.BACKUP_S3_ENDPOINT }}
         ACCESS_KEY_ID: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_S3_KEY_ID }}
         SECRET_ACCESS_KEY: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_S3_KEY }}        
         MIRROR_TARGET: ${{ inputs.s3-backup-path }}

From 4d55f5c1e7d2696f6593aa638ea4ca4020de49ba Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 19:25:45 -0700
Subject: [PATCH 24/70] [FIX] S3 Fix

---
 action.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/action.yml b/action.yml
index 8cf974a..12f4e71 100644
--- a/action.yml
+++ b/action.yml
@@ -23,14 +23,17 @@ runs:
         infisical-token: ${{ inputs.infisical-token }}
         secret-envs: edge
         secret-paths: /devops/gitea-backups
-    - name: Fix Endpoint Format
-      run: echo BACKUP_S3_ENDPOINT=${{ env.DEVOPS_GITEA_ELYSIUM_ORG_S3_ENDPOINT }} >> $GITHUB_ENV
+    - name: Fix Env Format
+      run: |
+        echo BACKUP_S3_ENDPOINT=${{ env.DEVOPS_GITEA_ELYSIUM_ORG_S3_ENDPOINT }} >> $GITHUB_ENV
+        echo BACKUP_S3_KEY_ID=${{ env.DEVOPS_GITEA_ELYSIUM_ORG_S3_KEY_ID }} >> $GITHUB_ENV
+        echo BACKUP_S3_KEY=${{ env.DEVOPS_GITEA_ELYSIUM_ORG_S3_KEY }} >> $GITHUB_ENV
     - name: S3 Backup
       uses: peter-evans/s3-backup@v1
       env:
         STORAGE_SERVICE_URL: ${{ env.BACKUP_S3_ENDPOINT }}
-        ACCESS_KEY_ID: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_S3_KEY_ID }}
-        SECRET_ACCESS_KEY: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_S3_KEY }}        
+        ACCESS_KEY_ID: ${{ env.BACKUP_S3_KEY_ID }}
+        SECRET_ACCESS_KEY: ${{ env.BACKUP_S3_KEY }}        
         MIRROR_TARGET: ${{ inputs.s3-backup-path }}
         MIRROR_SOURCE: ${{ gitea.workspace }}/repo
       with:

From 02ebb4634fd42a8973274d6b747e856769b74b55 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 19:26:49 -0700
Subject: [PATCH 25/70] [DOC] Normalized comments

---
 action.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/action.yml b/action.yml
index 12f4e71..373e64b 100644
--- a/action.yml
+++ b/action.yml
@@ -23,11 +23,13 @@ runs:
         infisical-token: ${{ inputs.infisical-token }}
         secret-envs: edge
         secret-paths: /devops/gitea-backups
+    # Fix Envar Format
     - name: Fix Env Format
       run: |
         echo BACKUP_S3_ENDPOINT=${{ env.DEVOPS_GITEA_ELYSIUM_ORG_S3_ENDPOINT }} >> $GITHUB_ENV
         echo BACKUP_S3_KEY_ID=${{ env.DEVOPS_GITEA_ELYSIUM_ORG_S3_KEY_ID }} >> $GITHUB_ENV
         echo BACKUP_S3_KEY=${{ env.DEVOPS_GITEA_ELYSIUM_ORG_S3_KEY }} >> $GITHUB_ENV
+    # Backup Repository
     - name: S3 Backup
       uses: peter-evans/s3-backup@v1
       env:

From 902de144dc1db30f33e5d265c798734a5a147ed1 Mon Sep 17 00:00:00 2001
From: dunemask <elijah@dunemask.net>
Date: Sun, 7 Apr 2024 02:43:01 +0000
Subject: [PATCH 26/70] [CHORE] Bump garden to 13.29

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index b371dad..4a275e7 100644
--- a/action.yml
+++ b/action.yml
@@ -11,7 +11,7 @@ inputs:
   garden-version:
       description: 'Version of Garden to deploy'
       required: false
-      default: 0.13.24
+      default: 0.13.29
   oasis-branch:
       description: 'Branch of Oasis to use'
       required: false

From f3a4f823687d9b20b5dd5fb542257c0c0d50e52f Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 20:27:56 -0600
Subject: [PATCH 27/70] [CHORE] Tweak Secret Usage

---
 action.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/action.yml b/action.yml
index 4a275e7..b773638 100644
--- a/action.yml
+++ b/action.yml
@@ -4,10 +4,10 @@ inputs:
   kubeconfig:
       description: 'A base64 encoded string of the kubeconfig to use. Required!'
       required: true
-  gitea-token:
-      description: 'Gitea token for downloading repositories'
+  forgejo-token:
+      description: 'Forgejo token for downloading repositories'
       required: false
-      default: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN }} # Action can't read env, so we need to reset it later
+      default: ${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN }} # Action can't read env, so we need to reset it later
   garden-version:
       description: 'Version of Garden to deploy'
       required: false
@@ -19,7 +19,7 @@ inputs:
   oasis-workspace: 
       descipriont: 'Workspace to setup Oasis'
       required: false
-      default: ${{ gitea.workspace}}/oasis
+      default: ${{ forgejo.workspace }}/oasis
 runs:
   using: "composite"
   steps:
@@ -30,7 +30,7 @@ runs:
       shell: bash
       run: |
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
-        echo DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN=${{ inputs.gitea-token }} >> $GITHUB_ENV
+        echo DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN=${{ inputs.forgejo-token }} >> $GITHUB_ENV
         echo "Checking out Oasis"
     # Checkout Oasis 
     - name: Checkout Oasis
@@ -38,7 +38,7 @@ runs:
       with:
         repository: "elysium/oasis"
         path: ${{ inputs.oasis-workspace }}
-        token: ${{ env.DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN }}
+        token: ${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN }}
         ref: ${{ inputs.oasis-branch }}
     - name: Download Garden
       shell: bash

From 4ed43f40be1e71f52144d2b31e3535e4b66a8e0b Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 20:32:33 -0600
Subject: [PATCH 28/70] [CHORE] Tweak Secret Usage

---
 action.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/action.yml b/action.yml
index b773638..9875757 100644
--- a/action.yml
+++ b/action.yml
@@ -29,8 +29,10 @@ runs:
     - name: Setup Enviornment Variables
       shell: bash
       run: |
+        echo "BEFORE ${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN }}"
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
         echo DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN=${{ inputs.forgejo-token }} >> $GITHUB_ENV
+        echo "AFTER ${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN }}"
         echo "Checking out Oasis"
     # Checkout Oasis 
     - name: Checkout Oasis

From 0b1c4cb212bb403887a5aa733a3cbdde17fd2187 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 21:27:56 -0600
Subject: [PATCH 29/70] [CHORE] Remove Excess Logging

---
 action.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/action.yml b/action.yml
index 9875757..b773638 100644
--- a/action.yml
+++ b/action.yml
@@ -29,10 +29,8 @@ runs:
     - name: Setup Enviornment Variables
       shell: bash
       run: |
-        echo "BEFORE ${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN }}"
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
         echo DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN=${{ inputs.forgejo-token }} >> $GITHUB_ENV
-        echo "AFTER ${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN }}"
         echo "Checking out Oasis"
     # Checkout Oasis 
     - name: Checkout Oasis

From 2dc6d1bbd15c8610339177f4a36bf360ec8a5cd7 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 21:47:25 -0600
Subject: [PATCH 30/70] [CHORE] Fix Endpoints & Forgejo Refs

---
 action.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/action.yml b/action.yml
index 373e64b..ba335d1 100644
--- a/action.yml
+++ b/action.yml
@@ -7,7 +7,7 @@ inputs:
   s3-backup-path: 
     description: "Workspace to setup Oasis"
     required: false
-    default: backups/gitea-repositories/${{ gitea.repository }}
+    default: backups/forgejo-repositories/${{ forgejo.repository }}
 runs:
   using: "composite"
   steps:
@@ -15,20 +15,20 @@ runs:
     - name: Checkout Repository
       uses: actions/checkout@v3
       with:
-        path: ${{ gitea.workspace }}/repo
+        path: ${{ forgejo.workspace }}/repo
     # Load Backup Envars
     - name: Setup Backup Envars
-      uses: https://gitea.dunemask.dev/elysium/elysium-actions@infisical-env
+      uses: https://forgejo.dunemask.dev/elysium/elysium-actions@infisical-env
       with:
         infisical-token: ${{ inputs.infisical-token }}
         secret-envs: edge
-        secret-paths: /devops/gitea-backups
+        secret-paths: /devops/forgejo-backups
     # Fix Envar Format
     - name: Fix Env Format
       run: |
-        echo BACKUP_S3_ENDPOINT=${{ env.DEVOPS_GITEA_ELYSIUM_ORG_S3_ENDPOINT }} >> $GITHUB_ENV
-        echo BACKUP_S3_KEY_ID=${{ env.DEVOPS_GITEA_ELYSIUM_ORG_S3_KEY_ID }} >> $GITHUB_ENV
-        echo BACKUP_S3_KEY=${{ env.DEVOPS_GITEA_ELYSIUM_ORG_S3_KEY }} >> $GITHUB_ENV
+        echo BACKUP_S3_ENDPOINT=${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_S3_ENDPOINT }} >> $GITHUB_ENV
+        echo BACKUP_S3_KEY_ID=${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_S3_KEY_ID }} >> $GITHUB_ENV
+        echo BACKUP_S3_KEY=${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_S3_KEY }} >> $GITHUB_ENV
     # Backup Repository
     - name: S3 Backup
       uses: peter-evans/s3-backup@v1
@@ -37,6 +37,6 @@ runs:
         ACCESS_KEY_ID: ${{ env.BACKUP_S3_KEY_ID }}
         SECRET_ACCESS_KEY: ${{ env.BACKUP_S3_KEY }}        
         MIRROR_TARGET: ${{ inputs.s3-backup-path }}
-        MIRROR_SOURCE: ${{ gitea.workspace }}/repo
+        MIRROR_SOURCE: ${{ forgejo.workspace }}/repo
       with:
         args: --overwrite --remove

From 41d4305f3afd84f741cb1581d23d5e2741a4ad2d Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 21:50:30 -0600
Subject: [PATCH 31/70] [CHORE] Fix Endpoints & Forgejo Refs

---
 action.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/action.yml b/action.yml
index ba335d1..25adb59 100644
--- a/action.yml
+++ b/action.yml
@@ -4,6 +4,9 @@ inputs:
   infisical-token:
     description: Infisical token for backup envars
     required: true
+  infisical-project:
+    description: Infisical Project
+    required: true
   s3-backup-path: 
     description: "Workspace to setup Oasis"
     required: false
@@ -21,6 +24,7 @@ runs:
       uses: https://forgejo.dunemask.dev/elysium/elysium-actions@infisical-env
       with:
         infisical-token: ${{ inputs.infisical-token }}
+        project-id: ${{ inputs.infisical-project }}
         secret-envs: edge
         secret-paths: /devops/forgejo-backups
     # Fix Envar Format

From 8646f62cbe8202dfc93805614894ce3e22999ce3 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 21:56:30 -0600
Subject: [PATCH 32/70] [CHORE] Adjust Actions

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 25adb59..7ed7020 100644
--- a/action.yml
+++ b/action.yml
@@ -35,7 +35,7 @@ runs:
         echo BACKUP_S3_KEY=${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_S3_KEY }} >> $GITHUB_ENV
     # Backup Repository
     - name: S3 Backup
-      uses: peter-evans/s3-backup@v1
+      uses: https://github.com/peter-evans/s3-backup@v1
       env:
         STORAGE_SERVICE_URL: ${{ env.BACKUP_S3_ENDPOINT }}
         ACCESS_KEY_ID: ${{ env.BACKUP_S3_KEY_ID }}

From 8fd38af4f89c161b52e993078743956c32e2e147 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 21:58:18 -0600
Subject: [PATCH 33/70] [CHORE] Adjust Actions

---
 action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index 7ed7020..0fcb2ce 100644
--- a/action.yml
+++ b/action.yml
@@ -7,7 +7,7 @@ inputs:
   infisical-project:
     description: Infisical Project
     required: true
-  s3-backup-path: 
+  s3-backup-path:
     description: "Workspace to setup Oasis"
     required: false
     default: backups/forgejo-repositories/${{ forgejo.repository }}
@@ -39,7 +39,7 @@ runs:
       env:
         STORAGE_SERVICE_URL: ${{ env.BACKUP_S3_ENDPOINT }}
         ACCESS_KEY_ID: ${{ env.BACKUP_S3_KEY_ID }}
-        SECRET_ACCESS_KEY: ${{ env.BACKUP_S3_KEY }}        
+        SECRET_ACCESS_KEY: ${{ env.BACKUP_S3_KEY }}
         MIRROR_TARGET: ${{ inputs.s3-backup-path }}
         MIRROR_SOURCE: ${{ forgejo.workspace }}/repo
       with:

From 75bd9ebc6d3d0dae28a5c0052e5c0a711b21cac7 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 22:02:57 -0600
Subject: [PATCH 34/70] [CHORE] Adjust Actions

---
 action.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 0fcb2ce..557321f 100644
--- a/action.yml
+++ b/action.yml
@@ -33,6 +33,11 @@ runs:
         echo BACKUP_S3_ENDPOINT=${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_S3_ENDPOINT }} >> $GITHUB_ENV
         echo BACKUP_S3_KEY_ID=${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_S3_KEY_ID }} >> $GITHUB_ENV
         echo BACKUP_S3_KEY=${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_S3_KEY }} >> $GITHUB_ENV
+        if [ -z "${{ inputs.s3-backup-path }}" ]; then
+          echo BACKUP_S3_MIRROR_TARGET=${{ inputs.s3-backup-path }} >> $GITHUB_ENV
+        else
+          echo BACKUP_S3_MIRROR_TARGET=backups/forgejo-repositories/${{ forgejo.repository }} >> $GITHUB_ENV
+        fi
     # Backup Repository
     - name: S3 Backup
       uses: https://github.com/peter-evans/s3-backup@v1
@@ -40,7 +45,7 @@ runs:
         STORAGE_SERVICE_URL: ${{ env.BACKUP_S3_ENDPOINT }}
         ACCESS_KEY_ID: ${{ env.BACKUP_S3_KEY_ID }}
         SECRET_ACCESS_KEY: ${{ env.BACKUP_S3_KEY }}
-        MIRROR_TARGET: ${{ inputs.s3-backup-path }}
+        MIRROR_TARGET: ${{ env.BACKUP_S3_MIRROR_TARGET }}
         MIRROR_SOURCE: ${{ forgejo.workspace }}/repo
       with:
         args: --overwrite --remove

From 1e3c32b3e7db8b2ad072567e76e04caf7b8868fc Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 22:06:12 -0600
Subject: [PATCH 35/70] [CHORE] Adjust Actions

---
 action.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/action.yml b/action.yml
index 557321f..c00b400 100644
--- a/action.yml
+++ b/action.yml
@@ -38,6 +38,8 @@ runs:
         else
           echo BACKUP_S3_MIRROR_TARGET=backups/forgejo-repositories/${{ forgejo.repository }} >> $GITHUB_ENV
         fi
+        echo "${{ env.BACKUP_S3_MIRROR_TARGET }}"
+        echo "backups/forgejo-repositories/${{ forgejo.repository }}"
     # Backup Repository
     - name: S3 Backup
       uses: https://github.com/peter-evans/s3-backup@v1

From bb8787fded5445bf245408d111322eef8843842e Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 22:07:54 -0600
Subject: [PATCH 36/70] [CHORE] Adjust Actions

---
 action.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/action.yml b/action.yml
index c00b400..5da43a3 100644
--- a/action.yml
+++ b/action.yml
@@ -40,6 +40,11 @@ runs:
         fi
         echo "${{ env.BACKUP_S3_MIRROR_TARGET }}"
         echo "backups/forgejo-repositories/${{ forgejo.repository }}"
+    - name: Fix Env Format
+      run: |
+        echo "vvvvv"
+        echo "${{ env.BACKUP_S3_MIRROR_TARGET }}"
+        echo "backups/forgejo-repositories/${{ forgejo.repository }}"
     # Backup Repository
     - name: S3 Backup
       uses: https://github.com/peter-evans/s3-backup@v1

From 30096f817f7b74520217dada9053f30340d74c41 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 22:09:52 -0600
Subject: [PATCH 37/70] [CHORE] Adjust Actions

---
 action.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/action.yml b/action.yml
index 5da43a3..80b98e9 100644
--- a/action.yml
+++ b/action.yml
@@ -19,6 +19,11 @@ runs:
       uses: actions/checkout@v3
       with:
         path: ${{ forgejo.workspace }}/repo
+    - name: Fix Env Format
+      run: |
+        echo "vvvvv"
+        echo "${{ env.BACKUP_S3_MIRROR_TARGET }}"
+        echo "backups/forgejo-repositories/${{ forgejo.repository }}"
     # Load Backup Envars
     - name: Setup Backup Envars
       uses: https://forgejo.dunemask.dev/elysium/elysium-actions@infisical-env

From ba73b418a8c172d736536c7786ebf525e02bb965 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 22:15:51 -0600
Subject: [PATCH 38/70] [CHORE] Adjust Action Trigger

---
 action.yml | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/action.yml b/action.yml
index 80b98e9..836af94 100644
--- a/action.yml
+++ b/action.yml
@@ -15,23 +15,23 @@ runs:
   using: "composite"
   steps:
     # Checkout Repository
-    - name: Checkout Repository
-      uses: actions/checkout@v3
-      with:
-        path: ${{ forgejo.workspace }}/repo
+    # - name: Checkout Repository
+    #   uses: actions/checkout@v3
+    #   with:
+    #     path: ${{ forgejo.workspace }}/repo
     - name: Fix Env Format
       run: |
         echo "vvvvv"
         echo "${{ env.BACKUP_S3_MIRROR_TARGET }}"
         echo "backups/forgejo-repositories/${{ forgejo.repository }}"
     # Load Backup Envars
-    - name: Setup Backup Envars
-      uses: https://forgejo.dunemask.dev/elysium/elysium-actions@infisical-env
-      with:
-        infisical-token: ${{ inputs.infisical-token }}
-        project-id: ${{ inputs.infisical-project }}
-        secret-envs: edge
-        secret-paths: /devops/forgejo-backups
+    # - name: Setup Backup Envars
+    #   uses: https://forgejo.dunemask.dev/elysium/elysium-actions@infisical-env
+    #   with:
+    #     infisical-token: ${{ inputs.infisical-token }}
+    #     project-id: ${{ inputs.infisical-project }}
+    #     secret-envs: edge
+    #     secret-paths: /devops/forgejo-backups
     # Fix Envar Format
     - name: Fix Env Format
       run: |
@@ -51,13 +51,13 @@ runs:
         echo "${{ env.BACKUP_S3_MIRROR_TARGET }}"
         echo "backups/forgejo-repositories/${{ forgejo.repository }}"
     # Backup Repository
-    - name: S3 Backup
-      uses: https://github.com/peter-evans/s3-backup@v1
-      env:
-        STORAGE_SERVICE_URL: ${{ env.BACKUP_S3_ENDPOINT }}
-        ACCESS_KEY_ID: ${{ env.BACKUP_S3_KEY_ID }}
-        SECRET_ACCESS_KEY: ${{ env.BACKUP_S3_KEY }}
-        MIRROR_TARGET: ${{ env.BACKUP_S3_MIRROR_TARGET }}
-        MIRROR_SOURCE: ${{ forgejo.workspace }}/repo
-      with:
-        args: --overwrite --remove
+    # - name: S3 Backup
+    #   uses: https://github.com/peter-evans/s3-backup@v1
+    #   env:
+    #     STORAGE_SERVICE_URL: ${{ env.BACKUP_S3_ENDPOINT }}
+    #     ACCESS_KEY_ID: ${{ env.BACKUP_S3_KEY_ID }}
+    #     SECRET_ACCESS_KEY: ${{ env.BACKUP_S3_KEY }}
+    #     MIRROR_TARGET: ${{ env.BACKUP_S3_MIRROR_TARGET }}
+    #     MIRROR_SOURCE: ${{ forgejo.workspace }}/repo
+    #   with:
+    #     args: --overwrite --remove

From 962ca38ff9674841edccd2a478b236091395f91c Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 22:16:52 -0600
Subject: [PATCH 39/70] [CHORE] Adjust Action Trigger

---
 action.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/action.yml b/action.yml
index 836af94..4ef7290 100644
--- a/action.yml
+++ b/action.yml
@@ -19,19 +19,19 @@ runs:
     #   uses: actions/checkout@v3
     #   with:
     #     path: ${{ forgejo.workspace }}/repo
-    - name: Fix Env Format
+    - name: Print 2nv1
       run: |
         echo "vvvvv"
         echo "${{ env.BACKUP_S3_MIRROR_TARGET }}"
         echo "backups/forgejo-repositories/${{ forgejo.repository }}"
     # Load Backup Envars
-    # - name: Setup Backup Envars
-    #   uses: https://forgejo.dunemask.dev/elysium/elysium-actions@infisical-env
-    #   with:
-    #     infisical-token: ${{ inputs.infisical-token }}
-    #     project-id: ${{ inputs.infisical-project }}
-    #     secret-envs: edge
-    #     secret-paths: /devops/forgejo-backups
+    - name: Setup Backup Envars
+      uses: https://forgejo.dunemask.dev/elysium/elysium-actions@infisical-env
+      with:
+        infisical-token: ${{ inputs.infisical-token }}
+        project-id: ${{ inputs.infisical-project }}
+        secret-envs: edge
+        secret-paths: /devops/forgejo-backups
     # Fix Envar Format
     - name: Fix Env Format
       run: |
@@ -45,7 +45,7 @@ runs:
         fi
         echo "${{ env.BACKUP_S3_MIRROR_TARGET }}"
         echo "backups/forgejo-repositories/${{ forgejo.repository }}"
-    - name: Fix Env Format
+    - name: Print env2
       run: |
         echo "vvvvv"
         echo "${{ env.BACKUP_S3_MIRROR_TARGET }}"

From f0038b6b69f5cd6d13003b04d10e4b21897e62e4 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 22:17:52 -0600
Subject: [PATCH 40/70] [CHORE] Adjust Action Trigger

---
 action.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/action.yml b/action.yml
index 4ef7290..b1edebf 100644
--- a/action.yml
+++ b/action.yml
@@ -19,6 +19,8 @@ runs:
     #   uses: actions/checkout@v3
     #   with:
     #     path: ${{ forgejo.workspace }}/repo
+    - name: Say HI
+      run: echo "Hello WOrld"
     - name: Print 2nv1
       run: |
         echo "vvvvv"

From f4f89dad0de96e14017f6d99053efa2f3dc42217 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 22:23:09 -0600
Subject: [PATCH 41/70] [CHORE] Adjust Action Trigger

---
 action.yml | 47 ++++++++++++++---------------------------------
 1 file changed, 14 insertions(+), 33 deletions(-)

diff --git a/action.yml b/action.yml
index b1edebf..1fbdd93 100644
--- a/action.yml
+++ b/action.yml
@@ -15,17 +15,10 @@ runs:
   using: "composite"
   steps:
     # Checkout Repository
-    # - name: Checkout Repository
-    #   uses: actions/checkout@v3
-    #   with:
-    #     path: ${{ forgejo.workspace }}/repo
-    - name: Say HI
-      run: echo "Hello WOrld"
-    - name: Print 2nv1
-      run: |
-        echo "vvvvv"
-        echo "${{ env.BACKUP_S3_MIRROR_TARGET }}"
-        echo "backups/forgejo-repositories/${{ forgejo.repository }}"
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+      with:
+        path: ${{ forgejo.workspace }}/repo
     # Load Backup Envars
     - name: Setup Backup Envars
       uses: https://forgejo.dunemask.dev/elysium/elysium-actions@infisical-env
@@ -40,26 +33,14 @@ runs:
         echo BACKUP_S3_ENDPOINT=${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_S3_ENDPOINT }} >> $GITHUB_ENV
         echo BACKUP_S3_KEY_ID=${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_S3_KEY_ID }} >> $GITHUB_ENV
         echo BACKUP_S3_KEY=${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_S3_KEY }} >> $GITHUB_ENV
-        if [ -z "${{ inputs.s3-backup-path }}" ]; then
-          echo BACKUP_S3_MIRROR_TARGET=${{ inputs.s3-backup-path }} >> $GITHUB_ENV
-        else
-          echo BACKUP_S3_MIRROR_TARGET=backups/forgejo-repositories/${{ forgejo.repository }} >> $GITHUB_ENV
-        fi
-        echo "${{ env.BACKUP_S3_MIRROR_TARGET }}"
-        echo "backups/forgejo-repositories/${{ forgejo.repository }}"
-    - name: Print env2
-      run: |
-        echo "vvvvv"
-        echo "${{ env.BACKUP_S3_MIRROR_TARGET }}"
-        echo "backups/forgejo-repositories/${{ forgejo.repository }}"
     # Backup Repository
-    # - name: S3 Backup
-    #   uses: https://github.com/peter-evans/s3-backup@v1
-    #   env:
-    #     STORAGE_SERVICE_URL: ${{ env.BACKUP_S3_ENDPOINT }}
-    #     ACCESS_KEY_ID: ${{ env.BACKUP_S3_KEY_ID }}
-    #     SECRET_ACCESS_KEY: ${{ env.BACKUP_S3_KEY }}
-    #     MIRROR_TARGET: ${{ env.BACKUP_S3_MIRROR_TARGET }}
-    #     MIRROR_SOURCE: ${{ forgejo.workspace }}/repo
-    #   with:
-    #     args: --overwrite --remove
+    - name: S3 Backup
+      uses: https://github.com/peter-evans/s3-backup@v1
+      env:
+        STORAGE_SERVICE_URL: ${{ env.BACKUP_S3_ENDPOINT }}
+        ACCESS_KEY_ID: ${{ env.BACKUP_S3_KEY_ID }}
+        SECRET_ACCESS_KEY: ${{ env.BACKUP_S3_KEY }}
+        MIRROR_TARGET: ${{ inputs.s3-backup-path }}
+        MIRROR_SOURCE: ${{ forgejo.workspace }}/repo
+      with:
+        args: --overwrite --remove

From 16a0461d975dd92b86abffd063acaa8315bd941d Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 14:48:41 -0600
Subject: [PATCH 42/70] [CHORE] Tweak Action Playground

---
 action.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/action.yml b/action.yml
index b773638..e71fb03 100644
--- a/action.yml
+++ b/action.yml
@@ -23,6 +23,8 @@ inputs:
 runs:
   using: "composite"
   steps:
+    - name: Echo Env
+      run: env
     # Set additional Envars
     - name: Setting Short Commit Sha
       run: echo SHORT_COMMIT_SHA=$(echo $GITHUB_SHA | cut -c 1-6) >> $GITHUB_ENV

From 15fc42183f24f9900893dd6f463037ee68587ecb Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 14:50:58 -0600
Subject: [PATCH 43/70] [CHORE] Tweak Action Playground

---
 action.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index e71fb03..39fda10 100644
--- a/action.yml
+++ b/action.yml
@@ -23,8 +23,6 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Echo Env
-      run: env
     # Set additional Envars
     - name: Setting Short Commit Sha
       run: echo SHORT_COMMIT_SHA=$(echo $GITHUB_SHA | cut -c 1-6) >> $GITHUB_ENV
@@ -32,6 +30,10 @@ runs:
       shell: bash
       run: |
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
+        echo "YEP"
+        echo $DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN
+        echo ${{ inputs.forgejo-token }}
+        echo "HAVAHAHNANNANA"
         echo DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN=${{ inputs.forgejo-token }} >> $GITHUB_ENV
         echo "Checking out Oasis"
     # Checkout Oasis 

From b0538f22323982e29c1f2bb0cc34f97eb1a7e12e Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 14:53:09 -0600
Subject: [PATCH 44/70] [CHORE] Tweak Checkout Action

---
 action.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/action.yml b/action.yml
index 39fda10..274caa5 100644
--- a/action.yml
+++ b/action.yml
@@ -30,15 +30,11 @@ runs:
       shell: bash
       run: |
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
-        echo "YEP"
-        echo $DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN
-        echo ${{ inputs.forgejo-token }}
-        echo "HAVAHAHNANNANA"
         echo DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN=${{ inputs.forgejo-token }} >> $GITHUB_ENV
         echo "Checking out Oasis"
     # Checkout Oasis 
     - name: Checkout Oasis
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: "elysium/oasis"
         path: ${{ inputs.oasis-workspace }}

From ccc1c48951e705cd8a7ba0a567c5729179083235 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 15:31:10 -0600
Subject: [PATCH 45/70] [CHORE] Adjust Actions

---
 action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/action.yml b/action.yml
index 274caa5..0e84618 100644
--- a/action.yml
+++ b/action.yml
@@ -73,5 +73,6 @@ runs:
       shell: bash
       run: |
         # Export environment variables
+        echo "OASIS_WORKSPACE=${{ inputs.oasis-workspace }}"
         echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
 

From 171bbfaf6986e793f0542b303f26b76dbbfe956e Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 15:32:51 -0600
Subject: [PATCH 46/70] [CHORE] Adjust Actions

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 0e84618..b89bfe0 100644
--- a/action.yml
+++ b/action.yml
@@ -19,7 +19,7 @@ inputs:
   oasis-workspace: 
       descipriont: 'Workspace to setup Oasis'
       required: false
-      default: ${{ forgejo.workspace }}/oasis
+      default: ${{ gitea.workspace }}/oasis
 runs:
   using: "composite"
   steps:

From 5a3ef3be18772df280b095ef108b77971da9bed1 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 15:33:59 -0600
Subject: [PATCH 47/70] [CHORE] Adjust Actions

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index b89bfe0..aa9cb29 100644
--- a/action.yml
+++ b/action.yml
@@ -19,7 +19,7 @@ inputs:
   oasis-workspace: 
       descipriont: 'Workspace to setup Oasis'
       required: false
-      default: ${{ gitea.workspace }}/oasis
+      default: oasis
 runs:
   using: "composite"
   steps:

From c065e05588e78c4b38a5d90bdb028f8e40d2f6a9 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 15:35:00 -0600
Subject: [PATCH 48/70] [CHORE] Adjust Actions

---
 action.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index aa9cb29..9eae6af 100644
--- a/action.yml
+++ b/action.yml
@@ -19,7 +19,7 @@ inputs:
   oasis-workspace: 
       descipriont: 'Workspace to setup Oasis'
       required: false
-      default: oasis
+      default: ${{ forgejo.workspace }}/oasis
 runs:
   using: "composite"
   steps:
@@ -73,6 +73,8 @@ runs:
       shell: bash
       run: |
         # Export environment variables
-        echo "OASIS_WORKSPACE=${{ inputs.oasis-workspace }}"
+        echo "${{ inputs.oasis-workspace }}"
+        env
+        echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }}
         echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
 

From 38622e122e1afccd9b5f4fe10cf484a132fd91cd Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 15:40:08 -0600
Subject: [PATCH 49/70] [CHORE] Adjust Actions

---
 action.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/action.yml b/action.yml
index 9eae6af..df0a27b 100644
--- a/action.yml
+++ b/action.yml
@@ -73,8 +73,6 @@ runs:
       shell: bash
       run: |
         # Export environment variables
-        echo "${{ inputs.oasis-workspace }}"
-        env
-        echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }}
-        echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
+        echo "OASIS_WORKSPACE=${{ inputs.oasis-workspace:-${{ forgejo.workspace }}/oasis }}"
+        echo "OASIS_WORKSPACE=${{ inputs.oasis-workspace:-${{ forgejo.workspace }}/oasis }}" >> $GITHUB_ENV
 

From 70c79a1171c972d2d533cec4018a4d4a28d4c6cf Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 15:41:23 -0600
Subject: [PATCH 50/70] [CHORE] Adjust Actions

---
 action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index df0a27b..39cb028 100644
--- a/action.yml
+++ b/action.yml
@@ -73,6 +73,6 @@ runs:
       shell: bash
       run: |
         # Export environment variables
-        echo "OASIS_WORKSPACE=${{ inputs.oasis-workspace:-${{ forgejo.workspace }}/oasis }}"
-        echo "OASIS_WORKSPACE=${{ inputs.oasis-workspace:-${{ forgejo.workspace }}/oasis }}" >> $GITHUB_ENV
+        echo "OASIS_WORKSPACE=${{ inputs.oasis-workspace:-${{ gitea.workspace }}/oasis }}"
+        echo "OASIS_WORKSPACE=${{ inputs.oasis-workspace:-${{ gitea.workspace }}/oasis }}" >> $GITHUB_ENV
 

From 4b035f4b8e64e2d3ffb5872d04569fe79eeca567 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 15:43:18 -0600
Subject: [PATCH 51/70] [CHORE] Adjust Actions

---
 action.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index 39cb028..0bf1ee1 100644
--- a/action.yml
+++ b/action.yml
@@ -73,6 +73,5 @@ runs:
       shell: bash
       run: |
         # Export environment variables
-        echo "OASIS_WORKSPACE=${{ inputs.oasis-workspace:-${{ gitea.workspace }}/oasis }}"
-        echo "OASIS_WORKSPACE=${{ inputs.oasis-workspace:-${{ gitea.workspace }}/oasis }}" >> $GITHUB_ENV
+        [ -z "${{ inputs.oasis-workspace }}" ] && echo OASIS_WORKSPACE=${{ forgejo.workspace }}/oasis >> $GITHUB_ENV  || echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
 

From b31e229b840667e374ab6c182cffc3e147aedd6d Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 15:44:09 -0600
Subject: [PATCH 52/70] [CHORE] Adjust Actions

---
 action.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 0bf1ee1..2ff34c2 100644
--- a/action.yml
+++ b/action.yml
@@ -73,5 +73,6 @@ runs:
       shell: bash
       run: |
         # Export environment variables
-        [ -z "${{ inputs.oasis-workspace }}" ] && echo OASIS_WORKSPACE=${{ forgejo.workspace }}/oasis >> $GITHUB_ENV  || echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
+        echo "So it doesn't work"
+        # [ -z "${{ inputs.oasis-workspace }}" ] && echo OASIS_WORKSPACE=${{ forgejo.workspace }}/oasis >> $GITHUB_ENV  || echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
 

From 486de9afd3be9038dbe28924fbc26f1d51fe5cbd Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 15:45:36 -0600
Subject: [PATCH 53/70] [CHORE] Adjust Actions

---
 action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index 2ff34c2..8553d2a 100644
--- a/action.yml
+++ b/action.yml
@@ -73,6 +73,6 @@ runs:
       shell: bash
       run: |
         # Export environment variables
-        echo "So it doesn't work"
-        # [ -z "${{ inputs.oasis-workspace }}" ] && echo OASIS_WORKSPACE=${{ forgejo.workspace }}/oasis >> $GITHUB_ENV  || echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
+        echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }}
+        echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
 

From a15d16e4d20042c6049d3aa1b406e5903d9ca895 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 15:47:06 -0600
Subject: [PATCH 54/70] [CHORE] Adjust Actions

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 8553d2a..1e541b2 100644
--- a/action.yml
+++ b/action.yml
@@ -19,7 +19,7 @@ inputs:
   oasis-workspace: 
       descipriont: 'Workspace to setup Oasis'
       required: false
-      default: ${{ forgejo.workspace }}/oasis
+      default: oasis
 runs:
   using: "composite"
   steps:

From b860d1e28404c52db98bdb0c8c41d3ff125b1713 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 15:49:36 -0600
Subject: [PATCH 55/70] [CHORE] Adjust Actions

---
 action.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index 1e541b2..a5d1fd8 100644
--- a/action.yml
+++ b/action.yml
@@ -73,6 +73,7 @@ runs:
       shell: bash
       run: |
         # Export environment variables
-        echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }}
-        echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
+        OASIS_WORKSPACE="${{ inputs.oasis-workspace || 'oasis' }}"
+        echo "OASIS_WORKSPACE=${OASIS_WORKSPACE}"
+        echo "OASIS_WORKSPACE=${OASIS_WORKSPACE}" >> $GITHUB_ENV
 

From 5173e5f7a8ffd0ce2ae89136a5bb80d9047cedb4 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 15:53:46 -0600
Subject: [PATCH 56/70] [CHORE] Adjust Actions

---
 action.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/action.yml b/action.yml
index a5d1fd8..274caa5 100644
--- a/action.yml
+++ b/action.yml
@@ -19,7 +19,7 @@ inputs:
   oasis-workspace: 
       descipriont: 'Workspace to setup Oasis'
       required: false
-      default: oasis
+      default: ${{ forgejo.workspace }}/oasis
 runs:
   using: "composite"
   steps:
@@ -73,7 +73,5 @@ runs:
       shell: bash
       run: |
         # Export environment variables
-        OASIS_WORKSPACE="${{ inputs.oasis-workspace || 'oasis' }}"
-        echo "OASIS_WORKSPACE=${OASIS_WORKSPACE}"
-        echo "OASIS_WORKSPACE=${OASIS_WORKSPACE}" >> $GITHUB_ENV
+        echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
 

From 112f94874186f44abf72025d7a7645b9115c8c70 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:01:02 -0600
Subject: [PATCH 57/70] [CHORE] Adjust Actions

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 274caa5..dfa8412 100644
--- a/action.yml
+++ b/action.yml
@@ -19,7 +19,7 @@ inputs:
   oasis-workspace: 
       descipriont: 'Workspace to setup Oasis'
       required: false
-      default: ${{ forgejo.workspace }}/oasis
+      default: oasis
 runs:
   using: "composite"
   steps:

From 642ca1ff5fa862fe65ba645430a8162c28fec9a6 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:01:17 -0600
Subject: [PATCH 58/70] [CHORE] Adjust Actions

---
 action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/action.yml b/action.yml
index dfa8412..aa9cb29 100644
--- a/action.yml
+++ b/action.yml
@@ -73,5 +73,6 @@ runs:
       shell: bash
       run: |
         # Export environment variables
+        echo "OASIS_WORKSPACE=${{ inputs.oasis-workspace }}"
         echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
 

From 30c126de335f008d4b68f03aa6d85d5b51bbfbde Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:04:59 -0600
Subject: [PATCH 59/70] [CHORE] Adjust Actions

---
 action.yml | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/action.yml b/action.yml
index aa9cb29..4116ff2 100644
--- a/action.yml
+++ b/action.yml
@@ -1,25 +1,25 @@
-name: 'Oasis Config Action'
-description: 'Configure env for deploying apps using Oasis'
+name: "Oasis Config Action"
+description: "Configure env for deploying apps using Oasis"
 inputs:
   kubeconfig:
-      description: 'A base64 encoded string of the kubeconfig to use. Required!'
-      required: true
+    description: "A base64 encoded string of the kubeconfig to use. Required!"
+    required: true
   forgejo-token:
-      description: 'Forgejo token for downloading repositories'
-      required: false
-      default: ${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN }} # Action can't read env, so we need to reset it later
+    description: "Forgejo token for downloading repositories"
+    required: false
+    default: ${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN }} # Action can't read env, so we need to reset it later
   garden-version:
-      description: 'Version of Garden to deploy'
-      required: false
-      default: 0.13.29
+    description: "Version of Garden to deploy"
+    required: false
+    default: 0.13.29
   oasis-branch:
-      description: 'Branch of Oasis to use'
-      required: false
-      default: master
-  oasis-workspace: 
-      descipriont: 'Workspace to setup Oasis'
-      required: false
-      default: oasis
+    description: "Branch of Oasis to use"
+    required: false
+    default: master
+  oasis-workspace:
+    descipriont: "Workspace to setup Oasis"
+    required: false
+    default: oasis
 runs:
   using: "composite"
   steps:
@@ -32,7 +32,7 @@ runs:
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
         echo DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN=${{ inputs.forgejo-token }} >> $GITHUB_ENV
         echo "Checking out Oasis"
-    # Checkout Oasis 
+    # Checkout Oasis
     - name: Checkout Oasis
       uses: actions/checkout@v4
       with:
@@ -75,4 +75,3 @@ runs:
         # Export environment variables
         echo "OASIS_WORKSPACE=${{ inputs.oasis-workspace }}"
         echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
-

From 936984d107dcce6ef7fb6209e588dfbd1bdc8da4 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:05:55 -0600
Subject: [PATCH 60/70] [CHORE] Adjust Actions

---
 action.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/action.yml b/action.yml
index 4116ff2..6a036b4 100644
--- a/action.yml
+++ b/action.yml
@@ -69,9 +69,9 @@ runs:
         echo ${{ inputs.kubeconfig }} | base64 -d  > ~/.kube/config &&
         chmod 700 ~/.kube/config
         echo "Finished setting up kubeconfig"
-    - name: Export Envars
-      shell: bash
-      run: |
-        # Export environment variables
-        echo "OASIS_WORKSPACE=${{ inputs.oasis-workspace }}"
-        echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
+    # - name: Export Envars
+    #   shell: bash
+    #   run: |
+    #     # Export environment variables
+    #     echo "OASIS_WORKSPACE=${{ inputs.oasis-workspace }}"
+    #     echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV

From 8723efbe94318ee2783554f68bf57083eb596ea7 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:09:17 -0600
Subject: [PATCH 61/70] [CHORE] Adjust Actions

---
 action.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/action.yml b/action.yml
index 6a036b4..e41a8d3 100644
--- a/action.yml
+++ b/action.yml
@@ -69,9 +69,12 @@ runs:
         echo ${{ inputs.kubeconfig }} | base64 -d  > ~/.kube/config &&
         chmod 700 ~/.kube/config
         echo "Finished setting up kubeconfig"
-    # - name: Export Envars
-    #   shell: bash
-    #   run: |
-    #     # Export environment variables
-    #     echo "OASIS_WORKSPACE=${{ inputs.oasis-workspace }}"
-    #     echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
+    - name: Export Envars
+      shell: bash
+      run: |
+        # Export environment variables
+        echo "OASIS_WORKSPACE=${{ inputs.oasis-workspace }}"
+        echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
+    - name: Post Echo
+      run: echo "POST"
+      

From f862dba1f2f035b49ffc014d2b0b180656b4e1d7 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:20:53 -0600
Subject: [PATCH 62/70] [CHORE] Adjust Actions

---
 action.yml | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/action.yml b/action.yml
index e41a8d3..872a7bf 100644
--- a/action.yml
+++ b/action.yml
@@ -1,25 +1,25 @@
-name: "Oasis Config Action"
-description: "Configure env for deploying apps using Oasis"
+name: 'Oasis Config Action'
+description: 'Configure env for deploying apps using Oasis'
 inputs:
   kubeconfig:
-    description: "A base64 encoded string of the kubeconfig to use. Required!"
-    required: true
+      description: 'A base64 encoded string of the kubeconfig to use. Required!'
+      required: true
   forgejo-token:
-    description: "Forgejo token for downloading repositories"
-    required: false
-    default: ${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN }} # Action can't read env, so we need to reset it later
+      description: 'Forgejo token for downloading repositories'
+      required: false
+      default: ${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN }} # Action can't read env, so we need to reset it later
   garden-version:
-    description: "Version of Garden to deploy"
-    required: false
-    default: 0.13.29
+      description: 'Version of Garden to deploy'
+      required: false
+      default: 0.13.29
   oasis-branch:
-    description: "Branch of Oasis to use"
-    required: false
-    default: master
-  oasis-workspace:
-    descipriont: "Workspace to setup Oasis"
-    required: false
-    default: oasis
+      description: 'Branch of Oasis to use'
+      required: false
+      default: master
+  oasis-workspace: 
+      descipriont: 'Workspace to setup Oasis'
+      required: false
+      default: ${{ forgejo.workspace }}/oasis
 runs:
   using: "composite"
   steps:
@@ -30,9 +30,13 @@ runs:
       shell: bash
       run: |
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
+        echo "YEP"
+        echo $DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN
+        echo ${{ inputs.forgejo-token }}
+        echo "HAVAHAHNANNANA"
         echo DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN=${{ inputs.forgejo-token }} >> $GITHUB_ENV
         echo "Checking out Oasis"
-    # Checkout Oasis
+    # Checkout Oasis 
     - name: Checkout Oasis
       uses: actions/checkout@v4
       with:
@@ -73,8 +77,5 @@ runs:
       shell: bash
       run: |
         # Export environment variables
-        echo "OASIS_WORKSPACE=${{ inputs.oasis-workspace }}"
         echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
-    - name: Post Echo
-      run: echo "POST"
-      
+

From 973a0c1630b7cc6005534305ce9555277a60d5a1 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:24:14 -0600
Subject: [PATCH 63/70] [CHORE] Adjust Actions

---
 action.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/action.yml b/action.yml
index 872a7bf..b773638 100644
--- a/action.yml
+++ b/action.yml
@@ -30,15 +30,11 @@ runs:
       shell: bash
       run: |
         echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
-        echo "YEP"
-        echo $DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN
-        echo ${{ inputs.forgejo-token }}
-        echo "HAVAHAHNANNANA"
         echo DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN=${{ inputs.forgejo-token }} >> $GITHUB_ENV
         echo "Checking out Oasis"
     # Checkout Oasis 
     - name: Checkout Oasis
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         repository: "elysium/oasis"
         path: ${{ inputs.oasis-workspace }}

From fc069b3d84c7a5efb650be38341994897cf61704 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:24:33 -0600
Subject: [PATCH 64/70] [CHORE] Adjust Actions

---
 action.yml | 82 +++++++++++++++++++++++++++---------------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/action.yml b/action.yml
index b773638..f2ebbc1 100644
--- a/action.yml
+++ b/action.yml
@@ -33,45 +33,45 @@ runs:
         echo DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN=${{ inputs.forgejo-token }} >> $GITHUB_ENV
         echo "Checking out Oasis"
     # Checkout Oasis 
-    - name: Checkout Oasis
-      uses: actions/checkout@v3
-      with:
-        repository: "elysium/oasis"
-        path: ${{ inputs.oasis-workspace }}
-        token: ${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN }}
-        ref: ${{ inputs.oasis-branch }}
-    - name: Download Garden
-      shell: bash
-      env:
-        GARDEN_BIN_VERSION: ${{ inputs.garden-version }}
-        GARDEN_DIR: ${{ runner.temp }}/garden
-      run: |
-        # Install Garden
-        mkdir -p "$GARDEN_DIR"
-        cd "$GARDEN_DIR"
-        if ! [ -d "$GARDEN_BIN_VERSION" ]; then
-          echo "Downloading ${GARDEN_BIN_VERSION}..."
-          if [[ "$GARDEN_BIN_VERSION" = "latest" ]]; then
-            tag_param=""
-          else
-            tag_param="$GARDEN_BIN_VERSION"
-          fi
-        fi
-         curl -sL https://get.garden.io/install.sh | bash -s -- $tag_param
-         echo PATH=$PATH:$HOME/.garden/bin >> $GITHUB_ENV
-         git config --global --add safe.directory $HOME/.garden/bin/static        
-         echo "Finished intalling Garden!"
-    # Configure K&S
-    - name: Configure K8S
-      run: |
-        echo "Setup kubeconfig"
-        mkdir -p ~/.kube &&
-        echo ${{ inputs.kubeconfig }} | base64 -d  > ~/.kube/config &&
-        chmod 700 ~/.kube/config
-        echo "Finished setting up kubeconfig"
-    - name: Export Envars
-      shell: bash
-      run: |
-        # Export environment variables
-        echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
+    # - name: Checkout Oasis
+    #   uses: actions/checkout@v3
+    #   with:
+    #     repository: "elysium/oasis"
+    #     path: ${{ inputs.oasis-workspace }}
+    #     token: ${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN }}
+    #     ref: ${{ inputs.oasis-branch }}
+    # - name: Download Garden
+    #   shell: bash
+    #   env:
+    #     GARDEN_BIN_VERSION: ${{ inputs.garden-version }}
+    #     GARDEN_DIR: ${{ runner.temp }}/garden
+    #   run: |
+    #     # Install Garden
+    #     mkdir -p "$GARDEN_DIR"
+    #     cd "$GARDEN_DIR"
+    #     if ! [ -d "$GARDEN_BIN_VERSION" ]; then
+    #       echo "Downloading ${GARDEN_BIN_VERSION}..."
+    #       if [[ "$GARDEN_BIN_VERSION" = "latest" ]]; then
+    #         tag_param=""
+    #       else
+    #         tag_param="$GARDEN_BIN_VERSION"
+    #       fi
+    #     fi
+    #      curl -sL https://get.garden.io/install.sh | bash -s -- $tag_param
+    #      echo PATH=$PATH:$HOME/.garden/bin >> $GITHUB_ENV
+    #      git config --global --add safe.directory $HOME/.garden/bin/static        
+    #      echo "Finished intalling Garden!"
+    # # Configure K&S
+    # - name: Configure K8S
+    #   run: |
+    #     echo "Setup kubeconfig"
+    #     mkdir -p ~/.kube &&
+    #     echo ${{ inputs.kubeconfig }} | base64 -d  > ~/.kube/config &&
+    #     chmod 700 ~/.kube/config
+    #     echo "Finished setting up kubeconfig"
+    # - name: Export Envars
+    #   shell: bash
+    #   run: |
+    #     # Export environment variables
+    #     echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
 

From 684bd4c5e6d55fcbe010dd482be22e5dd43ab83e Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:26:14 -0600
Subject: [PATCH 65/70] [CHORE] Adjust Actions

---
 action.yml | 82 +++++++++++++++++++++++++++---------------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/action.yml b/action.yml
index f2ebbc1..b773638 100644
--- a/action.yml
+++ b/action.yml
@@ -33,45 +33,45 @@ runs:
         echo DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN=${{ inputs.forgejo-token }} >> $GITHUB_ENV
         echo "Checking out Oasis"
     # Checkout Oasis 
-    # - name: Checkout Oasis
-    #   uses: actions/checkout@v3
-    #   with:
-    #     repository: "elysium/oasis"
-    #     path: ${{ inputs.oasis-workspace }}
-    #     token: ${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN }}
-    #     ref: ${{ inputs.oasis-branch }}
-    # - name: Download Garden
-    #   shell: bash
-    #   env:
-    #     GARDEN_BIN_VERSION: ${{ inputs.garden-version }}
-    #     GARDEN_DIR: ${{ runner.temp }}/garden
-    #   run: |
-    #     # Install Garden
-    #     mkdir -p "$GARDEN_DIR"
-    #     cd "$GARDEN_DIR"
-    #     if ! [ -d "$GARDEN_BIN_VERSION" ]; then
-    #       echo "Downloading ${GARDEN_BIN_VERSION}..."
-    #       if [[ "$GARDEN_BIN_VERSION" = "latest" ]]; then
-    #         tag_param=""
-    #       else
-    #         tag_param="$GARDEN_BIN_VERSION"
-    #       fi
-    #     fi
-    #      curl -sL https://get.garden.io/install.sh | bash -s -- $tag_param
-    #      echo PATH=$PATH:$HOME/.garden/bin >> $GITHUB_ENV
-    #      git config --global --add safe.directory $HOME/.garden/bin/static        
-    #      echo "Finished intalling Garden!"
-    # # Configure K&S
-    # - name: Configure K8S
-    #   run: |
-    #     echo "Setup kubeconfig"
-    #     mkdir -p ~/.kube &&
-    #     echo ${{ inputs.kubeconfig }} | base64 -d  > ~/.kube/config &&
-    #     chmod 700 ~/.kube/config
-    #     echo "Finished setting up kubeconfig"
-    # - name: Export Envars
-    #   shell: bash
-    #   run: |
-    #     # Export environment variables
-    #     echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
+    - name: Checkout Oasis
+      uses: actions/checkout@v3
+      with:
+        repository: "elysium/oasis"
+        path: ${{ inputs.oasis-workspace }}
+        token: ${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN }}
+        ref: ${{ inputs.oasis-branch }}
+    - name: Download Garden
+      shell: bash
+      env:
+        GARDEN_BIN_VERSION: ${{ inputs.garden-version }}
+        GARDEN_DIR: ${{ runner.temp }}/garden
+      run: |
+        # Install Garden
+        mkdir -p "$GARDEN_DIR"
+        cd "$GARDEN_DIR"
+        if ! [ -d "$GARDEN_BIN_VERSION" ]; then
+          echo "Downloading ${GARDEN_BIN_VERSION}..."
+          if [[ "$GARDEN_BIN_VERSION" = "latest" ]]; then
+            tag_param=""
+          else
+            tag_param="$GARDEN_BIN_VERSION"
+          fi
+        fi
+         curl -sL https://get.garden.io/install.sh | bash -s -- $tag_param
+         echo PATH=$PATH:$HOME/.garden/bin >> $GITHUB_ENV
+         git config --global --add safe.directory $HOME/.garden/bin/static        
+         echo "Finished intalling Garden!"
+    # Configure K&S
+    - name: Configure K8S
+      run: |
+        echo "Setup kubeconfig"
+        mkdir -p ~/.kube &&
+        echo ${{ inputs.kubeconfig }} | base64 -d  > ~/.kube/config &&
+        chmod 700 ~/.kube/config
+        echo "Finished setting up kubeconfig"
+    - name: Export Envars
+      shell: bash
+      run: |
+        # Export environment variables
+        echo OASIS_WORKSPACE=${{ inputs.oasis-workspace }} >> $GITHUB_ENV
 

From 181c35fac53cf81282827853b5a5d674a4e1b835 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:33:09 -0600
Subject: [PATCH 66/70] [CHORE] Adjust Actions

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 1fbdd93..0fcb2ce 100644
--- a/action.yml
+++ b/action.yml
@@ -16,7 +16,7 @@ runs:
   steps:
     # Checkout Repository
     - name: Checkout Repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         path: ${{ forgejo.workspace }}/repo
     # Load Backup Envars

From f3acd807bf3992bdf8429686069b283bc71cb4f1 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:34:47 -0600
Subject: [PATCH 67/70] [CHORE] Adjust Actions

---
 action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index 0fcb2ce..8c1da43 100644
--- a/action.yml
+++ b/action.yml
@@ -18,7 +18,7 @@ runs:
     - name: Checkout Repository
       uses: actions/checkout@v3
       with:
-        path: ${{ forgejo.workspace }}/repo
+        path: repo
     # Load Backup Envars
     - name: Setup Backup Envars
       uses: https://forgejo.dunemask.dev/elysium/elysium-actions@infisical-env
@@ -41,6 +41,6 @@ runs:
         ACCESS_KEY_ID: ${{ env.BACKUP_S3_KEY_ID }}
         SECRET_ACCESS_KEY: ${{ env.BACKUP_S3_KEY }}
         MIRROR_TARGET: ${{ inputs.s3-backup-path }}
-        MIRROR_SOURCE: ${{ forgejo.workspace }}/repo
+        MIRROR_SOURCE: repo
       with:
         args: --overwrite --remove

From b8805d941b36a056791df1f96b68f09cb14ab87c Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:35:42 -0600
Subject: [PATCH 68/70] [CHORE] Adjust Actions

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 8c1da43..9d0f435 100644
--- a/action.yml
+++ b/action.yml
@@ -10,7 +10,7 @@ inputs:
   s3-backup-path:
     description: "Workspace to setup Oasis"
     required: false
-    default: backups/forgejo-repositories/${{ forgejo.repository }}
+    default: backups/forgejo-repositories/test
 runs:
   using: "composite"
   steps:

From bf54b8092491b29188d11b52f7808a2e77cc127c Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:36:30 -0600
Subject: [PATCH 69/70] [CHORE] Adjust Actions

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 9d0f435..43b45c4 100644
--- a/action.yml
+++ b/action.yml
@@ -10,7 +10,7 @@ inputs:
   s3-backup-path:
     description: "Workspace to setup Oasis"
     required: false
-    default: backups/forgejo-repositories/test
+    default: backups/forgejo-repositories/${{ gitea.repository }}
 runs:
   using: "composite"
   steps:

From 656f3b4fc4f8c0c02ae47e6b5366d80186a58952 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:37:56 -0600
Subject: [PATCH 70/70] [CHORE] Adjust Actions

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index b773638..27fcc9a 100644
--- a/action.yml
+++ b/action.yml
@@ -19,7 +19,7 @@ inputs:
   oasis-workspace: 
       descipriont: 'Workspace to setup Oasis'
       required: false
-      default: ${{ forgejo.workspace }}/oasis
+      default: ${{ gitea.workspace }}/oasis
 runs:
   using: "composite"
   steps: