Merge branch 'master' into master

Cardinal-Cryptography · Dec 6, 2024 · 658dd4f · 658dd4f
2 parents 07360da + 764e12f
commit 658dd4f
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 3 deletions.
diff --git a/.github/actions/deploy/action.yaml b/.github/actions/deploy/action.yaml
@@ -4,6 +4,18 @@ inputs:
   image_tag:
     description: Tag of the docker image to be deployed
     required: true
+  autocommit-gpg-key-b64:
+    description: base64 encoded signing key
+    required: true
+  autocommit-gpg-key-fingerprint:
+    description: fingerprint of gpg key
+    required: true
+  autocommit-author:
+    description: Commit author
+    required: true
+  autocommit-email:
+    description: Commit author's mail
+    required: true
   github_token:
     required: true
   environment:
@@ -41,13 +53,22 @@ runs:
         cd aleph-apps/aleph-zero-dashboard/overlays/${{ inputs.environment }}/eu-central-1
         kustomize edit set image "aleph-zero-dashboard-image-placeholder=${{ env.DEPLOY_IMAGE }}"
 
+    - name: Configure signing key
+      shell: bash
+      run: |
+        echo ${{ inputs.autocommit-gpg-key-b64 }} | base64 -d > key.gpg
+        gpg --import key.gpg
+        rm key.gpg
+        git config --global user.signingkey $(echo ${{ inputs.autocommit-gpg-key-fingerprint }} | tail -c 17)
+
     - name: GIT | Commit changes to aleph-apps repository
-      uses: EndBug/add-and-commit@v5.1.0
+      uses: EndBug/add-and-commit@v9.1.4
       env:
         GITHUB_TOKEN: ${{ inputs.github_token }}
       with:
-        author_name: AlephZero Automation
-        author_email: [email protected]
+        author_name: ${{ inputs.autocommit-author }}
+        author_email: ${{ inputs.autocommit-email }}
+        commit: "-S"
         message: 'Updating aleph-zero-dashboard ${{ inputs.environment }} docker image tag: ${{ inputs.image_tag }}'
         add: '*.yaml'
         cwd: 'aleph-apps'

diff --git a/.github/workflows/build-and-deploy-to-devnet.yaml b/.github/workflows/build-and-deploy-to-devnet.yaml
@@ -43,6 +43,10 @@ jobs:
         with:
           environment: devnet
           kustomize_version: ${{ vars.KUSTOMIZE_VERSION }}
+          autocommit-author: ${{ secrets.AUTOCOMMIT_AUTHOR }}
+          autocommit-email: ${{ secrets.AUTOCOMMIT_EMAIL }}
+          autocommit-gpg-key-b64: ${{ secrets.AUTOCOMMIT_GPG_KEY_B64 }}
+          autocommit-gpg-key-fingerprint: ${{ secrets.AUTOCOMMIT_GPG_KEY_FINGERPRINT }}
           image_tag: ${{ needs.build-and-push.outputs.image_tag }}
           github_token: ${{ secrets.CI_GH_TOKEN }}
 

diff --git a/.github/workflows/build-and-deploy-to-mainnet.yaml b/.github/workflows/build-and-deploy-to-mainnet.yaml
@@ -40,6 +40,10 @@ jobs:
         with:
           environment: mainnet
           kustomize_version: ${{ vars.KUSTOMIZE_VERSION }}
+          autocommit-author: ${{ secrets.AUTOCOMMIT_AUTHOR }}
+          autocommit-email: ${{ secrets.AUTOCOMMIT_EMAIL }}
+          autocommit-gpg-key-b64: ${{ secrets.AUTOCOMMIT_GPG_KEY_B64 }}
+          autocommit-gpg-key-fingerprint: ${{ secrets.AUTOCOMMIT_GPG_KEY_FINGERPRINT }}
           image_tag: ${{ needs.build-and-push.outputs.image_tag }}
           github_token: ${{ secrets.CI_GH_TOKEN }}
 

diff --git a/.github/workflows/build-and-deploy-to-testnet.yaml b/.github/workflows/build-and-deploy-to-testnet.yaml
@@ -40,6 +40,10 @@ jobs:
         with:
           environment: testnet
           kustomize_version: ${{ vars.KUSTOMIZE_VERSION }}
+          autocommit-author: ${{ secrets.AUTOCOMMIT_AUTHOR }}
+          autocommit-email: ${{ secrets.AUTOCOMMIT_EMAIL }}
+          autocommit-gpg-key-b64: ${{ secrets.AUTOCOMMIT_GPG_KEY_B64 }}
+          autocommit-gpg-key-fingerprint: ${{ secrets.AUTOCOMMIT_GPG_KEY_FINGERPRINT }}
           image_tag: ${{ needs.build-and-push.outputs.image_tag }}
           github_token: ${{ secrets.CI_GH_TOKEN }}