Преглед на файлове

recover

Signed-off-by: shanghaikid <jiangruiyi@gmail.com>
shanghaikid преди 5 месеца
родител
ревизия
3e60eb55ab
променени са 2 файла, в които са добавени 21 реда и са изтрити 74 реда
  1. 10 15
      .github/workflows/dev.yml
  2. 11 59
      .github/workflows/release.yml

+ 10 - 15
.github/workflows/dev.yml

@@ -13,16 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        include:
-          - os: ubuntu-latest
-            name: "linux-amd64"
-            platform: "linux/amd64"
-          - os: ubuntu-latest
-            name: "linux-arm64"
-            platform: "linux/arm64"
-          - os: ubuntu-latest
-            name: "linux-arm-v7"
-            platform: "linux/arm/v7"
+        platform: 
+          - linux/amd64
+          - linux/arm64
+          - linux/arm/v7
 
     steps:
       - uses: actions/checkout@v4
@@ -48,7 +42,8 @@ jobs:
         with:
           context: .
           platforms: ${{ matrix.platform }}
-          tags: zilliz/attu:dev-${{ matrix.name }}
+          tags: |
+            zilliz/attu:dev
           cache-from: type=registry,ref=zilliz/attu:cache
           cache-to: type=inline
           build-args: |
@@ -76,7 +71,7 @@ jobs:
       - name: Create and Push Docker Manifest
         run: |
           docker manifest create zilliz/attu:dev \
-            zilliz/attu:dev-linux-amd64 \
-            zilliz/attu:dev-linux-arm64 \
-            zilliz/attu:dev-linux-arm-v7
-          docker manifest push zilliz/attu:dev
+            zilliz/attu:dev-linux/amd64 \
+            zilliz/attu:dev-linux/arm64 \
+            zilliz/attu:dev-linux/arm/v7
+          docker manifest push zilliz/attu:dev

+ 11 - 59
.github/workflows/release.yml

@@ -1,12 +1,12 @@
-name: Build and Release Electron App and Docker Image
+name: Build electron app
 
 on:
   push:
     tags:
-      - "*" # Triggers on any tag
+      - "*"
 
 jobs:
-  build_and_release:
+  release:
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -17,75 +17,27 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v4
 
-      - name: Install Node.js, NPM, and Yarn
+      - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v4
         with:
           node-version: 22
 
-      - name: Build client (only for non-Docker jobs)
+      - name: Build client
         run: |
           cd client
           yarn --network-timeout 100000
           yarn build
           cp -r build ../server
 
-      - name: Build and Release Electron App
+      - name: Build/release Electron app
         uses: samuelmeuli/action-electron-builder@v1
         with:
           package_root: "./server"
           build_script_name: "build-electron"
+          # GitHub token, automatically provided to the action
+          # (No need to define this secret in the repo settings)
           github_token: ${{ secrets.GH_TOKEN }}
-          release: ${{ startsWith(github.ref, 'refs/tags/') }}
 
-  # Job to build each Docker platform separately
-  docker_build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        platform: [linux/amd64, linux/arm64, linux/arm/v7]
-
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PWD }}
-
-      - name: Build and Push Docker Image for ${{ matrix.platform }}
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          platforms: ${{ matrix.platform }}
-          tags: |
-            zilliz/attu:${{ github.ref_name }}-${{ matrix.platform }}
-          build-args: |
-            VERSION=${{ github.ref_name }}
-          push: true
-
-  # Job to combine platform-specific tags into one multi-platform tag
-  docker_manifest:
-    needs: docker_build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install Docker CLI
-        run: sudo apt-get update && sudo apt-get install -y docker.io
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PWD }}
-
-      - name: Create and Push Docker Manifest
-        run: |
-          docker manifest create zilliz/attu:${{ github.ref_name }} \
-            --amend zilliz/attu:${{ github.ref_name }}-linux/amd64 \
-            --amend zilliz/attu:${{ github.ref_name }}-linux/arm64 \
-            --amend zilliz/attu:${{ github.ref_name }}-linux/arm/v7
-          docker manifest push zilliz/attu:${{ github.ref_name }}
+          # If the commit is tagged with a version (e.g. "v1.0.0"),
+          # release the app after building
+          release: ${{ startsWith(github.ref, 'refs/tags/v') }}