Merge branch 'master' of github.com:binary-com/deriv-app

deriv-com · Feb 19, 2024 · 173f7bc · 173f7bc
2 parents 8427c67 + b899fa7
commit 173f7bc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 22 deletions.
diff --git a/.github/actions/download_remote_config_backup/action.yml b/.github/actions/download_remote_config_backup/action.yml
@@ -3,12 +3,6 @@ description: Download remote config backup
 inputs:
   REMOTE_CONFIG_URL:
     description: "Remote config backup URL"
-  GPG_PRIVATE_KEY:
-    description: "GPG private key"
-  GPG_PASSPHRASE:
-    description: "GPG passphrase"
-  GITHUB_TOKEN:
-    description: "GitHub token"
 runs:
   using: composite
   steps:

diff --git a/.github/workflows/release_test.yml b/.github/workflows/release_test.yml
@@ -16,13 +16,6 @@ jobs:
       uses: "./.github/actions/setup_node"
     - name: Install Dependencies
       uses: "./.github/actions/npm_install_from_cache"
-    - name: Download Remote Config Backup File
-      uses: ./.github/actions/download_remote_config_backup
-      with:
-        GITHUB_TOKEN: ${{ github.token }}
-        REMOTE_CONFIG_URL: ${{ vars.REMOTE_CONFIG_URL }}
-        GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-        GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
     - name: Build
       uses: "./.github/actions/build"
       with:

diff --git a/.github/workflows/remote_config_pr.yml b/.github/workflows/remote_config_pr.yml
@@ -1,4 +1,12 @@
 name: Deriv App Remote Config backup file
+
+permissions:
+  actions: write
+  checks: write
+  contents: write
+  deployments: write
+  pull-requests: write
+  statuses: write
 on:
   push:
     branches:
@@ -13,24 +21,24 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+    - name: Import GPG key
+      id: import-gpg
+      uses: deriv-com/ghaction-import-gpg@v6
+      with:
+        gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+        passphrase: ${{ secrets.GPG_PASSPHRASE }}
+        git_user_signingkey: true
+        git_commit_gpgsign: true
     - name: Checkout to remote_config_update_branch
       run: |
         git fetch origin
         git checkout "${{ env.REMOTE_CONFIG_BRANCH }}" || git checkout -b "${{ env.REMOTE_CONFIG_BRANCH }}" origin/"${{ env.REMOTE_CONFIG_BRANCH }}"
-      
+      shell: bash
     - name: Download Remote Config Backup File
       uses: ./.github/actions/download_remote_config_backup
       with:
         REMOTE_CONFIG_URL: ${{ vars.REMOTE_CONFIG_URL }}
 
-    - name: Import GPG key
-      id: import-gpg
-      uses: deriv-com/ghaction-import-gpg@v6
-      with:
-        gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-        passphrase: ${{ secrets.GPG_PASSPHRASE }}
-        git_user_signingkey: true
-        git_commit_gpgsign: true
     - name: Commit the file and Create PR
       env:
         GIT_AUTHOR_NAME: ${{ steps.import-gpg.outputs.name }}