chore: change env var to DEB_xxx (#224)

* chore: change env var to DEB_xxx

Co-authored-by: soulbird <[email protected]>

Author: soulbird

.circleci/config.yml

@@ -153,9 +153,9 @@ jobs:
             mkdir -p "${VAR_DEB_WORKBENCH_DIR}"
             sudo apt-get update
             sudo apt install -y gpg ca-certificates
-            RPM_GPG_PRIV_KEY=$(echo $RPM_GPG_PRIV_KEY_BASE64 | base64 -d)
-            echo "${RPM_GPG_PRIV_KEY}" >> /tmp/deb-gpg-publish.private
-            echo "${RPM_GPG_PASSPHRASE}" >> /tmp/deb-gpg-publish.passphrase
+            DEB_GPG_PRIV_KEY=$(echo $DEB_GPG_PRIV_KEY_BASE64 | base64 -d)
+            echo "${DEB_GPG_PRIV_KEY}" >> /tmp/deb-gpg-publish.private
+            echo "${DEB_GPG_PASSPHRASE}" >> /tmp/deb-gpg-publish.passphrase
             ./utils/publish-deb.sh init_cos_utils
             sudo -E ./utils/publish-deb.sh init_freight_utils
             sudo -E ./utils/publish-deb.sh init_gpg

.github/workflows/publish-deb.yml

@@ -79,12 +79,12 @@ jobs:
 
       - name: Init publish utils
         env:
-          GPG_MAIL: ${{ secrets.GPG_MAIL }}
+          DEB_GPG_MAIL: ${{ secrets.DEB_GPG_MAIL }}
           TENCENT_COS_SECRETID: ${{ secrets.TENCENT_COS_SECRETID }}
           TENCENT_COS_SECRETKEY: ${{ secrets.TENCENT_COS_SECRETKEY }}
         run: |
-          echo "${{ secrets.RPM_GPG_PRIV_KEY }}" >> /tmp/deb-gpg-publish.private
-          echo "${{ secrets.RPM_GPG_PASSPHRASE }}" >> /tmp/deb-gpg-publish.passphrase
+          echo "${{ secrets.DEB_GPG_PRIV_KEY }}" >> /tmp/deb-gpg-publish.private
+          echo "${{ secrets.DEB_GPG_PASSPHRASE }}" >> /tmp/deb-gpg-publish.passphrase
           ./utils/publish-deb.sh init_cos_utils
           sudo -E ./utils/publish-deb.sh init_freight_utils
           sudo -E ./utils/publish-deb.sh init_gpg

utils/publish-deb.sh

@@ -28,7 +28,7 @@ func_gpg_key_load() {
     gpg --import --pinentry-mode loopback \
         --batch --passphrase-file "${VAR_GPG_PASSPHRASE}" "${VAR_GPG_PRIV_KET}"
 
-    gpg --list-keys --fingerprint | grep "${GPG_MAIL}" -B 1 \
+    gpg --list-keys --fingerprint | grep "${DEB_GPG_MAIL}" -B 1 \
     | tr -d ' ' | head -1 | awk 'BEGIN { FS = "\n" } ; { print $1":6:" }' \
     | gpg --import-ownertrust
 
@@ -152,6 +152,7 @@ func_deb_upload() {
     # We will only upload apisix and apisix-base,
     # so the directory is fixed: pool/main/a.
     # Regardless of other packages.
+
     export COS_CMD=$COS_CMD
     export arch_path=$arch_path
     export BUCKET=$2
@@ -192,7 +193,7 @@ init_cos_utils)
     ;;
 init_freight_utils)
     func_freight_utils_install
-    func_freight_utils_init ${GPG_MAIL} "/tmp/freight"
+    func_freight_utils_init ${DEB_GPG_MAIL} "/tmp/freight"
     ;;
 init_gpg)
     func_gpg_key_load