Fix the action build base on the master branch

kubesphere · Dec 14, 2021 · 8574b92 · 8574b92
1 parent 8947d85
commit 8574b92
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/.github/workflows/build-dev-image.yml b/.github/workflows/build-dev-image.yml
@@ -33,20 +33,31 @@ jobs:
           wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2
           tar xvjf phantomjs-2.1.1-linux-x86_64.tar.bz2
           ls -ahl
+
+          # v2.0-alpha-6 is a pre-release, jcli is not able to download it automatically.
+          mkdir -p ~/.jenkins-cli
+          curl https://github.com/LinuxSuRen/custom-war-packager/releases/download/v2.0-alpha-6/custom-war-packager-cli-2.0-alpha-7-20210527.031403-1-jar-with-dependencies.jar \
+            -L --output ~/.jenkins-cli/cwp-cli.jar
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Build env
+        id: build_env
+        shell: bash
+        run: |
+          echo "::set-output name=version::${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}"
       - name: Build
         run: |
           docker login --username ${{ secrets.DOCKER_HUB_USER }} --password ${{secrets.DOCKER_HUB_TOKEN}}
 
           curl -L https://github.com/jenkins-zh/jenkins-cli/releases/latest/download/jcli-linux-amd64.tar.gz|tar xzv
-
           export PATH=.:$PATH:phantomjs/bin
 
-          # there's no a release for the multi-arch building but https://github.com/jenkinsci/custom-war-packager/releases/tag/v2.0-alpha-6
-          wget https://github.com/LinuxSuRen/custom-war-packager/releases/download/v2.0-alpha-6/custom-war-packager-cli-2.0-alpha-7-20210527.031403-1-jar-with-dependencies.jar
-          mv custom-war-packager-cli-2.0-alpha-7-20210527.031403-1-jar-with-dependencies.jar ~/.jenkins-cli/cwp-cli.jar
           jcli cwp --install-artifacts --config-path formula.yaml --value-set output=push \
-            --value-set version=kubespheredev/ks-jenkins:${{ steps.meta.outputs.version }}
+            --value-set tag=kubespheredev/ks-jenkins:${{ steps.build_env.outputs.version }}
       - name: Push Image ghcr.io
         run: |
+          docker login ghcr.io --username ${{ secrets.GH_USER }} --password ${{secrets.GH_TOKEN}}
           jcli cwp --install-artifacts --config-path formula.yaml --value-set output=push \
-            --value-set tag=ghcr.io/kubesphere/ks-jenkins:${{ steps.meta.outputs.version }}
+            --value-set tag=ghcr.io/kubesphere/ks-jenkins:${{ steps.build_env.outputs.version }}
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -50,8 +50,7 @@ jobs:
         run: |
           curl -L https://github.com/jenkins-zh/jenkins-cli/releases/latest/download/jcli-linux-amd64.tar.gz|tar xzv
           export PATH=.:$PATH:phantomjs/bin
-          wget https://github.com/LinuxSuRen/custom-war-packager/releases/download/v2.0-alpha-6/custom-war-packager-cli-2.0-alpha-7-20210527.031403-1-jar-with-dependencies.jar
-          mv custom-war-packager-cli-2.0-alpha-7-20210527.031403-1-jar-with-dependencies.jar ~/.jenkins-cli/cwp-cli.jar
+
           jcli cwp --install-artifacts --config-path formula.yaml \
             --value-set output=load \
             --value-set tag=kubespheredev/ks-jenkins:${{ steps.build_env.outputs.version }}