fix: ci

DVKunion · Apr 2, 2024 · cf18337 · cf18337
1 parent ddec7d8
commit cf18337
Show file tree

Hide file tree

Showing 10 changed files with 177 additions and 128 deletions.
diff --git a/.github/conf/.goreleaser.yml b/.github/conf/.goreleaser.yml
@@ -1,28 +1,30 @@
 before:
   hooks:
     - go mod tidy
-    -
 builds:
   - binary: seamoon
     env:
       - CGO_ENABLED=0
     main: ./cmd/main.go
-    goos:
-      - linux
-      - windows
-      - darwin
+    ignore:
+      #  modernc.org/[email protected] not implement if these platform
+      - goos: darwin
+        goarch: 386
+      - goos: windows
+        goarch: 386
     goarm:
       - 6
       - 7
     ldflags:
-      - -s -w -X github.com/DVKunion/SeaMoon/system/xlog.Version={{.Version}} -X github.com/DVKunion/SeaMoon/system/xlog.Commit={{.Sha}}
+      - -s -w -X github.com/DVKunion/SeaMoon/system/xlog.Version={{.Version}} -X github.com/DVKunion/SeaMoon/system/xlog.Commit={{.ShortCommit}}
 checksum:
   name_template: 'checksums.txt'
 snapshot:
   name_template: "{{ .Tag  }}-next"
 upx:
   - enabled: true
-    goos: [linux, darwin]
+    goos: [ linux, darwin ]
+    goarch: [ amd64, arm64 ]
     compress: best
 changelog:
   sort: asc

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,11 +1,11 @@
-name: SeaMoon
-
+name: seamoon-build
 on:
-  push:
-    tags:
-      - "*"
-  pull_request:
-    branches: [ "main" ]
+  workflow_call:
+    secrets:
+      DOCKERHUB_USERNAME:
+        required: true
+      DOCKERHUB_TOKEN:
+        required: true
 
 jobs:
   build:
@@ -29,4 +29,38 @@ jobs:
           go build -o seamoon -v --ldflags "-s -w -X github.com/DVKunion/SeaMoon/pkg/system/xlog.Version=${{github.ref_name}} -X github.com/DVKunion/SeaMoon/pkg/system/xlog.Commit=${{github.sha}}" cmd/main.go
       - uses: actions/upload-artifact@v4
         with:
-          path: seamoon
+          path: seamoon
+  build-docker:
+    name: build-docker
+    runs-on: ubuntu-20.04
+    if: startsWith(github.ref, 'refs/tags/')
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
+      - uses: docker/login-action@v3
+        name: login docker.io
+        with:
+          registry: "docker.io"
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+      - name: Build Front
+        run: |
+          cd web && npm install | true && npm run build && cp -r dist ../cmd/client/static
+      - uses: docker/build-push-action@v5
+        with:
+          push: true
+          platforms: |
+            linux/amd64
+            linux/arm64
+            linux/386
+          tags: |
+            docker.io/dvkunion/seamoon:latest
+            docker.io/dvkunion/seamoon:${{github.ref_name}}
+          build-args: |
+            VERSION=${{github.ref_name}}
+          context: ./
diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -1,26 +1,22 @@
 # Simple workflow for deploying static content to GitHub Pages
-name: Deploy
-
+name: seamoon-package
 on:
-  push:
-    branches: [ "main", "feat/docs" ]
+  workflow_call:
+
 jobs:
   # Single deploy job since we're just deploying
   deploy:
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [ 18.x ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Use Node.js ${{ matrix.node-version }}
+      - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: 18.x
       - name: Build
         # 安装 Node 之后就可以执行构建脚本
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,10 +1,9 @@
-name: goreleaser
-
+name: seamoon-goreleaser
 on:
-  push:
-    tags:
-      - "*"
-
+  workflow_call:
+    secrets:
+      GO_RELEASER_GITHUB_TOKEN:
+        required: true
 jobs:
   build:
     name: GoReleaser build
@@ -14,6 +13,13 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+      - name: Build Front
+        run: |
+          cd web && npm install | true && npm run build && cp -r dist ../cmd/client/static
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
@@ -24,7 +30,7 @@ jobs:
         with:
           distribution: goreleaser
           version: latest
-          args: -f .github/conf/.goreleaser.yml
+          args: -f .github/conf/.goreleaser.yml --timeout 1h
           workdir: .
         env:
           GITHUB_TOKEN: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }}
diff --git a/.github/workflows/seamoon.yml b/.github/workflows/seamoon.yml
@@ -0,0 +1,26 @@
+name: seamoon
+on: [ push, pull_request ]
+jobs:
+  build:
+    uses: ./.github/workflows/build.yml
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+  docs:
+    if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/feat/docs' }}
+    uses: ./.github/workflows/pages.yml
+  release:
+    if: startsWith(github.ref, 'refs/tags/')
+    uses: ./.github/workflows/release.yml
+    secrets:
+      GO_RELEASER_GITHUB_TOKEN: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }}
+  sync:
+    needs: [ build ]
+    if: startsWith(github.ref, 'refs/tags/')
+    uses: ./.github/workflows/sync.yml
+    secrets:
+      ALIYUN_USERNAME: ${{ secrets.ALIYUN_USERNAME }}
+      ALIYUN_PASSWORD: ${{ secrets.ALIYUN_PASSWORD }}
+      TENCENT_USERNAME: ${{ secrets.TENCENT_USERNAME }}
+      TENCENT_PASSWORD: ${{ secrets.TENCENT_PASSWORD }}
+
diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
@@ -0,0 +1,77 @@
+name: seamoon-package
+on:
+  workflow_call:
+    secrets:
+      ALIYUN_USERNAME:
+        required: true
+      ALIYUN_PASSWORD:
+        required: true
+      TENCENT_USERNAME:
+        required: true
+      TENCENT_PASSWORD:
+        required: true
+
+jobs:
+  sync-aliyun:
+    name: sync-aliyun
+    runs-on: ubuntu-20.04
+    if: startsWith(github.ref, 'refs/tags/')
+    strategy:
+      fail-fast: false
+      matrix:
+        registry: [ registry.cn-hangzhou.aliyuncs.com,
+          registry.cn-shanghai.aliyuncs.com,
+          registry.cn-qingdao.aliyuncs.com,
+          registry.cn-beijing.aliyuncs.com,
+          registry.cn-zhangjiakou.aliyuncs.com,
+          registry.cn-huhehaote.aliyuncs.com,
+          registry.cn-shenzhen.aliyuncs.com,
+          registry.cn-chengdu.aliyuncs.com,
+          registry.cn-hongkong.aliyuncs.com,
+          registry.ap-northeast-1.aliyuncs.com,
+          registry.ap-southeast-1.aliyuncs.com,
+          registry.ap-southeast-2.aliyuncs.com,
+          registry.ap-southeast-3.aliyuncs.com,
+          registry.ap-southeast-5.aliyuncs.com,
+          registry.ap-south-1.aliyuncs.com,
+          registry.eu-central-1.aliyuncs.com,
+          registry.eu-west-1.aliyuncs.com,
+          registry.us-west-1.aliyuncs.com,
+          registry.us-east-1.aliyuncs.com
+        ]
+        repo: [seamoon/seamoon]
+    steps:
+      - uses: actions/checkout@v4
+      - name: skopeo-copy
+        run: |
+          skopeo sync --src docker --dest docker --dest-creds ${{ secrets.ALIYUN_USERNAME }}:${{ secrets.ALIYUN_PASSWORD }} docker.io/dvkunion/seamoon:${{github.ref_name}} ${{ matrix.registry }}/${{ matrix.repo }}
+          skopeo sync --src docker --dest docker --dest-creds ${{ secrets.ALIYUN_USERNAME }}:${{ secrets.ALIYUN_PASSWORD }} docker.io/dvkunion/seamoon:latest ${{ matrix.registry }}/${{ matrix.repo }}
+
+  package-tencent:
+    name: package-tecent
+    runs-on: ubuntu-20.04
+    if: startsWith(github.ref, 'refs/tags/')
+    strategy:
+      fail-fast: false
+      matrix:
+        registry: [ hkccr.ccs.tencentyun.com,
+          inccr.ccs.tencentyun.com,
+          sgccr.ccs.tencentyun.com,
+          thccr.ccs.tencentyun.com,
+          krccr.ccs.tencentyun.com,
+          jpccr.ccs.tencentyun.com,
+          deccr.ccs.tencentyun.com,
+          useccr.ccs.tencentyun.com,
+          uswccr.ccs.tencentyun.com,
+          ccr.ccs.tencentyun.com
+        ]
+        repo: [seamoon/seamoon]
+        include:
+          - registry: ccr.ccs.tencentyun.com
+            repo: [dvkunion/seamoon]
+    steps:
+      - uses: actions/checkout@v4
+      - name: skopeo-copy
+        run: |
+          skopeo sync --src docker --dest docker --dest-creds ${{ secrets.TENCENT_USERNAME }}:${{ secrets.TENCENT_PASSWORD }} docker.io/dvkunion/seamoon:${{github.ref_name}} ${{ matrix.registry }}/${{ matrix.repo }}
+          skopeo sync --src docker --dest docker --dest-creds ${{ secrets.TENCENT_USERNAME }}:${{ secrets.TENCENT_PASSWORD }} docker.io/dvkunion/seamoon:latest ${{ matrix.registry }}/${{ matrix.repo }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,3 @@
-# build stage
-FROM node:20 as front
-COPY .. /src
-WORKDIR /src/web
-RUN npm run build
-
 FROM golang:alpine AS build
 ARG VERSION
 ARG SHA
@@ -12,8 +6,6 @@ WORKDIR /src
 ENV CGO_ENABLED 0
 ENV VERSION=${VERSION}
 ENV SHA=${SHA}
-COPY --from=front /src/web/dist /src/cmd/client/static
-#COPY ./seamoon /tmp/seamoon
 RUN go build -v -ldflags "-X github.com/DVKunion/SeaMoon/system/xlog.Version=${VERSION} -X github.com/DVKunion/SeaMoon/system/xlog.Commit=${SHA}" -o /tmp/seamoon cmd/main.go
 RUN chmod +x /tmp/seamoon
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories && \

diff --git a/web/src/pages/function/index.tsx b/web/src/pages/function/index.tsx
@@ -43,7 +43,7 @@ const Tunnel: React.FC = () => {
       rowKey={"ID"}
       showActions="hover"
       rowSelection={{}}
-      grid={{gutter: 16, xs: 1, sm: 2, md:  2, lg: 2, xl: 3}}
+      grid={{gutter: 16, xs: 1, sm: 2, md: 2, lg: 2, xl: 3, xxl: 3}}
       onItem={(record: Serverless.Tunnel) => {
         return {
           onClick: () => {