chore: upload deb package to artifacts only (#226)

Co-authored-by: soulbird <[email protected]>
api7 · Jul 22, 2022 · 9e1dea7 · 9e1dea7
1 parent 578c20a
commit 9e1dea7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 72 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,31 +1,6 @@
 # Use the latest 2.1 version of CircleCI pipeline process engine.
 # See: https://circleci.com/docs/2.0/configuration-reference
 version: 2.1
-commands:
-  description: publish deb package
-  publish_package:
-    steps:
-      - run:
-          name: backup dists to ci bucket
-          command: |
-            sudo -E ./utils/publish-deb.sh dists_backup
-      - run:
-          name: download pool dir to local
-          command: |
-            sudo -E ./utils/publish-deb.sh repo_clone
-      - run:
-          name: rebuild deb repo
-          command: |
-            sudo -E ./utils/publish-deb.sh repo_rebuild
-      - run:
-          name: upload repo
-          command: |
-            sudo -E ./utils/publish-deb.sh repo_upload
-      - run:
-          name: pulish repo
-          command: |
-            sudo -E ./utils/publish-deb.sh repo_publish
-            sudo -E ./utils/publish-deb.sh repo_backup_remove
 # Define a job to be invoked later in a workflow.
 # See: https://circleci.com/docs/2.0/configuration-reference/#jobs
 jobs:
@@ -152,13 +127,6 @@ jobs:
           command: |
             mkdir -p "${VAR_DEB_WORKBENCH_DIR}"
             sudo apt-get update
-            sudo apt install -y gpg ca-certificates
-            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
 
       - when:
           condition:
@@ -174,7 +142,8 @@ jobs:
                   make package type=deb app=apisix openresty=apisix-base checkout=${APISIX_TAG_VERSION} version=${APISIX_TAG_VERSION} image_base=${VAR_OS} image_tag=${VAR_OS_RELEASE}
                   mv ./output/apisix_${APISIX_TAG_VERSION}-0~${VAR_OS}${VAR_OS_RELEASE}_arm64.deb ${VAR_DEB_WORKBENCH_DIR}
 
-            - publish_package
+            - store_artifacts:
+                path: /tmp/output
 
       - when:
           condition:
@@ -188,7 +157,8 @@ jobs:
                   make package type=deb app=apisix-base checkout=${APISIX_BASE_TAG_VERSION} version=${APISIX_BASE_TAG_VERSION} image_base=${VAR_OS} image_tag=${VAR_OS_RELEASE}
                   mv ./output/apisix-base_${APISIX_BASE_TAG_VERSION}-0~${VAR_OS}${VAR_OS_RELEASE}_arm64.deb ${VAR_DEB_WORKBENCH_DIR}
 
-            - publish_package
+            - store_artifacts:
+                path: /tmp/output
 
 # Invoke jobs via workflows
 # See: https://circleci.com/docs/2.0/configuration-reference/#workflows

diff --git a/.github/workflows/publish-deb.yml b/.github/workflows/publish-deb.yml
@@ -9,9 +9,6 @@ jobs:
     runs-on: ubuntu-18.04
     timeout-minutes: 60
     env:
-      VAR_COS_BUCKET_CI: ${{ secrets.VAR_COS_BUCKET_CI }}
-      VAR_COS_BUCKET_REPO: ${{ secrets.VAR_COS_BUCKET_REPO }}
-      VAR_COS_ENDPOINT: ${{ secrets.VAR_COS_ENDPOINT }}
       VAR_DEB_WORKBENCH_DIR: /tmp/output
       VAR_OS: debian
       VAR_CODENAME: bullseye
@@ -26,7 +23,6 @@ jobs:
       - name: Init basic publish env
         run: |
           sudo apt-get update
-          sudo apt install -y gpg ca-certificates
           mkdir -p "${VAR_DEB_WORKBENCH_DIR}"
 
       - name: Extract Tags name
@@ -67,45 +63,13 @@ jobs:
         if: ${{ startsWith(steps.tag_type.outputs.version, 'apisix/') }}
         uses: actions/[email protected]
         with:
-          name: "apisix_${{ steps.tag_env.outputs.version}}-0~${{ VAR_OS }}${{ VAR_OS_RELEASE }}_amd64.deb"
+          name: "apisix_${{ steps.tag_env.outputs.version}}-0~${{ env.VAR_OS }}${{ env.VAR_OS_RELEASE }}_amd64.deb"
           path: "${{ env.VAR_DEB_WORKBENCH_DIR }}/apisix_${{ steps.tag_env.outputs.version}}-0~${{ env.VAR_OS }}${{ env.VAR_OS_RELEASE }}_amd64.deb"
 
       - name: Upload apisix-base Artifact
         if: ${{ startsWith(steps.tag_type.outputs.version, 'apisix-base/') }}
         uses: actions/[email protected]
         with:
-          name: "apisix-base_${{ steps.tag_env.outputs.version}}-0~${{ VAR_OS }}${{ VAR_OS_RELEASE }}_amd64.deb"
+          name: "apisix-base_${{ steps.tag_env.outputs.version}}-0~${{ env.VAR_OS }}${{ env.VAR_OS_RELEASE }}_amd64.deb"
           path: "${{ env.VAR_DEB_WORKBENCH_DIR }}/apisix-base_${{ steps.tag_env.outputs.version}}-0~${{ env.VAR_OS }}${{ env.VAR_OS_RELEASE }}_amd64.deb"
 
-      - name: Init publish utils
-        env:
-          DEB_GPG_MAIL: ${{ secrets.DEB_GPG_MAIL }}
-          TENCENT_COS_SECRETID: ${{ secrets.TENCENT_COS_SECRETID }}
-          TENCENT_COS_SECRETKEY: ${{ secrets.TENCENT_COS_SECRETKEY }}
-        run: |
-          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
-
-      - name: backup dists to ci bucket
-        run:
-          sudo -E ./utils/publish-deb.sh dists_backup
-
-      - name: download pool dir to local
-        run:
-          sudo -E ./utils/publish-deb.sh repo_clone
-
-      - name: rebuild deb repo
-        run:
-          sudo -E ./utils/publish-deb.sh repo_rebuild
-
-      - name: upload repo
-        run:
-          sudo -E ./utils/publish-deb.sh repo_upload
-
-      - name: pulish repo
-        run:
-          sudo -E ./utils/publish-deb.sh repo_publish
-          sudo -E ./utils/publish-deb.sh repo_backup_remove