ci: use gpg to sign commit [skip ci]

VSCodium · Jan 8, 2025 · 50e1085 · 50e1085
1 parent 7bef72f
commit 50e1085
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 28 deletions.
diff --git a/.github/workflows/insider-spearhead.yml b/.github/workflows/insider-spearhead.yml
@@ -69,16 +69,6 @@ jobs:
         run: ./update_upstream.sh
         if: env.SHOULD_BUILD == 'yes' && github.event.inputs.dont_update != 'true'
 
-      # - name: Commit changes
-      #   uses: iarekylew00t/verified-bot-commit@v1
-      #   with:
-      #     ref: ${{ env.COMMIT_REF }}
-      #     message: ${{ env.COMMIT_MESSAGE }}
-      #     token: ${{ secrets.STRONGER_GITHUB_TOKEN }}
-      #     files: |
-      #       upstream/*.json
-      #   if: env.SHOULD_BUILD == 'yes' && env.SHOULD_COMMIT == 'yes'
-
       - name: Prepare source
         run: ./prepare_src.sh
         if: env.SHOULD_BUILD == 'yes'

diff --git a/.github/workflows/stable-spearhead.yml b/.github/workflows/stable-spearhead.yml
@@ -51,20 +51,19 @@ jobs:
         run: ./build.sh
         if: env.SHOULD_BUILD == 'yes'
 
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+        if: env.SHOULD_BUILD == 'yes' && github.event.inputs.dont_update != 'true'
+
       - name: Update upstream version
         run: ./update_upstream.sh
         if: env.SHOULD_BUILD == 'yes' && github.event.inputs.dont_update != 'true'
 
-      - name: Commit changes
-        uses: iarekylew00t/verified-bot-commit@v1
-        with:
-          ref: ${{ env.COMMIT_REF }}
-          message: ${{ env.COMMIT_MESSAGE }}
-          token: ${{ secrets.STRONGER_GITHUB_TOKEN }}
-          files: |
-            upstream/*.json
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_COMMIT == 'yes'
-
       - name: Prepare source
         run: ./prepare_src.sh
         if: env.SHOULD_BUILD == 'yes'

diff --git a/update_upstream.sh b/update_upstream.sh
@@ -16,14 +16,6 @@ git add .
 CHANGES=$( git status --porcelain )
 
 if [[ -n "${CHANGES}" ]]; then
-  # COMMIT_MESSAGE="build(${VSCODE_QUALITY}): update to commit ${MS_COMMIT:0:7}"
-  # COMMIT_REF=$( git rev-parse --abbrev-ref HEAD )
-
-  # if [[ "${GITHUB_ENV}" ]]; then
-  #   echo "SHOULD_COMMIT=yes" >> "${GITHUB_ENV}"
-  #   echo "COMMIT_MESSAGE=${COMMIT_MESSAGE}" >> "${GITHUB_ENV}"
-  #   echo "COMMIT_REF=${COMMIT_REF}" >> "${GITHUB_ENV}"
-  # fi
   git commit -S -m "build(${VSCODE_QUALITY}): update to commit ${MS_COMMIT:0:7}"
 
   BRANCH_NAME=$( git rev-parse --abbrev-ref HEAD )