Merge remote-tracking branch 'origin/main'

update release yml update release yml update update
jinzhongjia · Sep 30, 2023 · dc9f824 · dc9f824
2 parents eb27e69 + 7bec995
commit dc9f824
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 24 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,10 +7,7 @@ on:
 jobs:
   build-go-binary:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        goos: [linux, windows] # 需要打包的系统
-        goarch: [amd64, arm64] # 需要打包的架构
+
     steps:
       - name: Node Setup
         uses: actions/setup-node@v3
@@ -22,6 +19,11 @@ jobs:
         with:
           version: 8
 
+      - name: Go setup 
+        uses: actions/setup-go@v4
+        with:
+          go-version: 'stable'
+
       - uses: actions/checkout@v3
 
       - name: build front src
@@ -38,17 +40,14 @@ jobs:
           cp -r src/admin/dist/ dist/admin
 
       - name: build
-        uses: actions/setup-go@v4
-        with:
-          go-version: 'stable'
         run: |
-          CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o movie-${{ github.ref }}
-          CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags="-s -w" -o movie-${{ github.ref }}.exe
+          CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o movie-linux
+          CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags="-s -w" -o movie-window.exe
 
       - name: Upload assets
         uses: softprops/action-gh-release@v1
         with:
-          files:
-            movie-${{ github.ref }}
-            movie-${{ github.ref }}.exe
           prerelease: false
+          files:
+            movie-linux
+            movie-window.exe
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -34,17 +34,5 @@ services:
       DATABASE_NAME: movie # mysql数据库
       LISTEN_ADDR: :8000 # 主程序监听地址，与ports后面端口保持一致
 
-  # 瞭望塔 容器监听更新
-  watchtower:
-    image: containrrr/watchtower
-    container_name: movie_watcher
-    restart: always
-    environment:
-      - TZ=Asia/Shanghai
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /root/.docker/config.json:/config.json
-    command: movie movie_watcher --cleanup --schedule "0 0 4 * * *"
-    # command: movie movie_watcher --cleanup --interval 60
 volumes:
   mysql_data: