Merge branch 'develop'

cars10 · Apr 23, 2024 · 9b37e83 · 9b37e83
2 parents a39b9ac + 5312b9c
commit 9b37e83
Showing 1 changed file with 33 additions and 41 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -119,56 +119,48 @@ jobs:
         if: matrix.platform == 'windows-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: windows_msi
+          name: windows_artifacts
           if-no-files-found: error
           path: |
             src-tauri/target/release/bundle/msi/elasticvue_*_x64*
             src-tauri/target/release/elasticvue.exe
 
-      ### merge artifacts
-
-      - name: Merge artifacts
-        uses: actions/upload-artifact/merge@v4
-        with:
-          name: artifacts
-          delete-merged: true
-
-  build_docker:
-    name: Build docker images
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker hub login
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker buildx
-        uses: docker/setup-buildx-action@v3
-
-      - uses: martinbeentjes/npm-get-version-action@v1.3.1
-        id: package-version
-
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          file: docker/Dockerfile_multiarch
-          push: true
-          tags: cars10/elasticvue:latest,cars10/elasticvue:${{ steps.package-version.outputs.current-version }}
-          #tags: cars10/elasticvue:${{ steps.package-version.outputs.current-version }}
+#  build_docker:
+#    name: Build docker images
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Docker hub login
+#        uses: docker/login-action@v3
+#        with:
+#          username: ${{ secrets.DOCKERHUB_USERNAME }}
+#          password: ${{ secrets.DOCKERHUB_TOKEN }}
+#
+#      - uses: actions/checkout@v4
+#
+#      - name: Set up QEMU
+#        uses: docker/setup-qemu-action@v3
+#
+#      - name: Set up Docker buildx
+#        uses: docker/setup-buildx-action@v3
+#
+#      - uses: martinbeentjes/npm-get-version-action@v1.3.1
+#        id: package-version
+#
+#      - name: Build and push
+#        uses: docker/build-push-action@v5
+#        with:
+#          context: .
+#          platforms: linux/amd64,linux/arm64,linux/arm/v7
+#          file: docker/Dockerfile_multiarch
+#          push: true
+#          tags: cars10/elasticvue:latest,cars10/elasticvue:${{ steps.package-version.outputs.current-version }}
+#          #tags: cars10/elasticvue:${{ steps.package-version.outputs.current-version }}
 
   publish:
     name: Publish release
     needs:
       - build_desktop
-      - build_docker
+      #- build_docker
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -187,7 +179,7 @@ jobs:
           prerelease: false
           tag: ${{ github.ref_name }}
           name: ${{ github.ref_name }}
-          artifacts: github-artifacts/artifact/*
+          artifacts: github-artifacts/*/*
           body: |
             ## Using elasticvue
             ### Desktop app