From 881621c35c5e07b2be7f041fabedcbb4f2fe88b5 Mon Sep 17 00:00:00 2001 From: Dunemask Date: Tue, 13 Feb 2024 16:49:46 -0700 Subject: [PATCH 01/22] [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 8191038ee0cb7d178193e618c4e1ebc3c8130160 Mon Sep 17 00:00:00 2001 From: dunemask Date: Thu, 15 Feb 2024 04:48:52 +0000 Subject: [PATCH 02/22] [FEATURE] Adjust URLS --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e4fd7c2..0e57a58 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,9 @@ The actions are used by Elysium to run CI/CD tasks and this repo will be archive 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) +- [Oasis Auto Setup](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/oasis-setup-auto/action.yml) - [Infisical Env](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/infisical-env/action.yml) +- [Oasis Advanced Setup](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/oasis-setup-advanced/action.yml) - [Elysium CI/CD](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/elysium-ci-cd/action.yml) ## Workflow Template From 26eff76d906f57cca7a7ca75343dbeb4aca60583 Mon Sep 17 00:00:00 2001 From: Dunemask Date: Thu, 15 Feb 2024 19:09:47 -0700 Subject: [PATCH 03/22] [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 Date: Thu, 15 Feb 2024 19:24:18 -0700 Subject: [PATCH 04/22] [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 Date: Thu, 15 Feb 2024 19:25:45 -0700 Subject: [PATCH 05/22] [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 Date: Thu, 15 Feb 2024 19:26:49 -0700 Subject: [PATCH 06/22] [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 2dc6d1bbd15c8610339177f4a36bf360ec8a5cd7 Mon Sep 17 00:00:00 2001 From: Dunemask Date: Sat, 24 Aug 2024 21:47:25 -0600 Subject: [PATCH 07/22] [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 Date: Sat, 24 Aug 2024 21:50:30 -0600 Subject: [PATCH 08/22] [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 Date: Sat, 24 Aug 2024 21:56:30 -0600 Subject: [PATCH 09/22] [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 Date: Sat, 24 Aug 2024 21:58:18 -0600 Subject: [PATCH 10/22] [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 Date: Sat, 24 Aug 2024 22:02:57 -0600 Subject: [PATCH 11/22] [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 Date: Sat, 24 Aug 2024 22:06:12 -0600 Subject: [PATCH 12/22] [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 Date: Sat, 24 Aug 2024 22:07:54 -0600 Subject: [PATCH 13/22] [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 Date: Sat, 24 Aug 2024 22:09:52 -0600 Subject: [PATCH 14/22] [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 Date: Sat, 24 Aug 2024 22:15:51 -0600 Subject: [PATCH 15/22] [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 Date: Sat, 24 Aug 2024 22:16:52 -0600 Subject: [PATCH 16/22] [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 Date: Sat, 24 Aug 2024 22:17:52 -0600 Subject: [PATCH 17/22] [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 Date: Sat, 24 Aug 2024 22:23:09 -0600 Subject: [PATCH 18/22] [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 181c35fac53cf81282827853b5a5d674a4e1b835 Mon Sep 17 00:00:00 2001 From: Dunemask Date: Sun, 25 Aug 2024 16:33:09 -0600 Subject: [PATCH 19/22] [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 Date: Sun, 25 Aug 2024 16:34:47 -0600 Subject: [PATCH 20/22] [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 Date: Sun, 25 Aug 2024 16:35:42 -0600 Subject: [PATCH 21/22] [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 Date: Sun, 25 Aug 2024 16:36:30 -0600 Subject: [PATCH 22/22] [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: