Merge pull request #47 from dwdcth/3.0

3.0 去除windows arm64

.github/workflows/go.yml

@@ -3,90 +3,84 @@ name: Go
 on:
   create:
     tags:
-      - v*
+      - v3*
 jobs:
 
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-
-    - name: Build
-      run: go build -o m7s_linux_x86_64
-      
-    - name: Tar
-      run: tar -zcvf linux.tgz m7s_linux_x86_64 config.toml
-      
-    - name: Deploy
-      uses: garygrossgarten/github-action-scp@release
-      with:
-          local: /home/runner/work/monibuca/monibuca/linux.tgz
-          remote: /opt/dexter/linux.tgz
-          host: monibuca.com
-          username: root
-          privateKey: ${{ secrets.PEM }}
-    - name: Release
-      uses: softprops/action-gh-release@v1
-      with:
-          files: "linux.tgz"
-  build2:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v2
     
-    - name: Set up Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-
-    - name: Build
-      run: go build -o m7s_x86_64.exe
-            
-    - name: Tar
-      run: tar -zcvf windows.tgz m7s_x86_64.exe config.toml
-      
-    - name: Deploy
-      uses: garygrossgarten/github-action-scp@release
-      with:
-          local: D:\\a\\monibuca\\monibuca\\windows.tgz
-          remote: /opt/dexter/windows.tgz
-          host: monibuca.com
-          username: root
-          privateKey: ${{ secrets.PEM }}
-    - name: Release
-      uses: softprops/action-gh-release@v1
-      with:
-          files: "windows.tgz"
-  build3:
-    runs-on: macos-latest
-    steps:
     - uses: actions/checkout@v2
-    
+      with:
+          fetch-depth: 1
+
+    - name: Set up Env
+      run: echo "version=${GITHUB_REF:11}" >> $GITHUB_ENV
+
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.18
 
-    - name: Build
-      run: go build -o m7s_darwin_x86_64
+    - name: Cache Go modules
+      uses: actions/cache@v1
+      with:
+        path: ~/go/pkg/mod
+        key: runner.os−go−{ { hashFiles('**/go.sum') } }
+        restore-keys: ${{ runner.os }}-go-        
 
-    - name: Tar
-      run: tar -zcvf mac.tgz m7s_darwin_x86_64 config.toml
-
-    - name: Deploy
+    - name: Run GoReleaser
+      uses: goreleaser/goreleaser-action@v2
+      if: success() && startsWith(github.ref, 'refs/tags/')
+      with:
+        version: latest
+        args: release --rm-dist
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              
+    - name: Deploy Windows
       uses: garygrossgarten/github-action-scp@release
       with:
-          local: /Users/runner/work/monibuca/monibuca/mac.tgz
-          remote: /opt/dexter/mac.tgz
-          host: monibuca.com
-          username: root
-          privateKey: ${{ secrets.PEM }}
-    - name: Release
-      uses: softprops/action-gh-release@v1
+        local: dist/m7s_${{ env.version }}_windows_amd64.tar.gz
+        remote: /opt/dexter/windows.tgz
+        host: monibuca.com
+        username: root
+        privateKey: ${{ secrets.PEM }}
+
+    - name: Deploy Mac
+      uses: garygrossgarten/github-action-scp@release
       with:
-          files: "mac.tgz"
+        local: dist/m7s_${{ env.version }}_darwin_amd64.tar.gz
+        remote: /opt/dexter/mac.tgz
+        host: monibuca.com
+        username: root
+        privateKey: ${{ secrets.PEM }}		  
+
+    - name: Deploy Mac arm64
+      uses: garygrossgarten/github-action-scp@release
+      with:
+        local: dist/m7s_${{ env.version }}_darwin_arm64.tar.gz
+        remote: /opt/dexter/mac_arm64.tgz
+        host: monibuca.com
+        username: root
+        privateKey: ${{ secrets.PEM }}		        
+
+    - name: Deploy Linux
+      uses: garygrossgarten/github-action-scp@release
+      with:
+        local: dist/m7s_${{ env.version }}_linux_amd64.tar.gz
+        remote: /opt/dexter/linux.tgz
+        host: monibuca.com
+        username: root
+        privateKey: ${{ secrets.PEM }}
+
+    - name: Deploy Linux arm64
+      uses: garygrossgarten/github-action-scp@release
+      with:
+        local: dist/m7s_${{ env.version }}_linux_arm64.tar.gz
+        remote: /opt/dexter/linux_arm64.tgz
+        host: monibuca.com
+        username: root
+        privateKey: ${{ secrets.PEM }}        
+        
+         

.gitignore

@@ -7,4 +7,6 @@ resource
 node_modules
 shutdown.bat
 shutdown.sh
-.m7s
+.m7s
+debug.go
+dist/

go.mod

@@ -4,8 +4,8 @@ go 1.16
 
 require (
 	github.com/Monibuca/engine/v3 v3.5.1
-	github.com/Monibuca/plugin-gateway/v3 v3.0.13
-	github.com/Monibuca/plugin-gb28181/v3 v3.0.7
+	github.com/Monibuca/plugin-gateway/v3 v3.0.14
+	github.com/Monibuca/plugin-gb28181/v3 v3.0.8
 	github.com/Monibuca/plugin-hdl/v3 v3.0.7
 	github.com/Monibuca/plugin-hls/v3 v3.0.6
 	github.com/Monibuca/plugin-jessica/v3 v3.0.0

go.sum

@@ -7,10 +7,10 @@ github.com/Monibuca/engine/v3 v3.4.5/go.mod h1:Dik9pFxU9TFI5vj8Sv5QXZM+ooCs2fm9P
 github.com/Monibuca/engine/v3 v3.5.0/go.mod h1:yNiVKeHxgv+Ez+f2RHXMkXoa5Oxv+G7Ch+MJdHi7ing=
 github.com/Monibuca/engine/v3 v3.5.1 h1:3AX+FwxerMw3JuyGXIOd/1dYCjA3IzWLKH/zq/GWe20=
 github.com/Monibuca/engine/v3 v3.5.1/go.mod h1:yNiVKeHxgv+Ez+f2RHXMkXoa5Oxv+G7Ch+MJdHi7ing=
-github.com/Monibuca/plugin-gateway/v3 v3.0.13 h1:/RdKU//3bsbnWMlMYcN0RIpuTetBUcD+OYD2U3AfjJw=
-github.com/Monibuca/plugin-gateway/v3 v3.0.13/go.mod h1:Pw5seYubBswGoF4knryLbLp6qrkYPwg3a7ZupgOir/4=
-github.com/Monibuca/plugin-gb28181/v3 v3.0.7 h1:sa89DEGBa/eTmwSmR2XDoe8xjrUgKaGiZHNC7seX1MQ=
-github.com/Monibuca/plugin-gb28181/v3 v3.0.7/go.mod h1:EIu6vD1irPweLcA+1dC4k05wVe6ygYn6ErMfEx+UYPo=
+github.com/Monibuca/plugin-gateway/v3 v3.0.14 h1:gCQyOmdhOSNi8SMPcm11eT2P/Qi1tPzOaAX450F/gK4=
+github.com/Monibuca/plugin-gateway/v3 v3.0.14/go.mod h1:Pw5seYubBswGoF4knryLbLp6qrkYPwg3a7ZupgOir/4=
+github.com/Monibuca/plugin-gb28181/v3 v3.0.8 h1:UMLoxZfIqsyV/vBldx0lt0LU5i2jvlMB8Yboms9vvKA=
+github.com/Monibuca/plugin-gb28181/v3 v3.0.8/go.mod h1:EIu6vD1irPweLcA+1dC4k05wVe6ygYn6ErMfEx+UYPo=
 github.com/Monibuca/plugin-hdl/v3 v3.0.7 h1:caNQwYzOVYgAxGksTEYVey9LW/7v1VlvgwSYqANHlZ0=
 github.com/Monibuca/plugin-hdl/v3 v3.0.7/go.mod h1:ImBolaupuPvXGoWD5hOUUMvSPPuzrg2lzVWqhcXmdVA=
 github.com/Monibuca/plugin-hls/v3 v3.0.6 h1:WfM9BeTnezQJK6WmC40A3yyxXXGFqJNMePvcjKtYa+M=

goreleaser.yml

@@ -0,0 +1,38 @@
+project_name: m7s
+archives:
+  -
+    files:
+      - config.toml
+builds:
+  - env: [CGO_ENABLED=0]
+    ignore:
+      - goos: windows
+        goarch: arm64     
+    goos:
+      - linux
+      - windows
+      - darwin
+    goarch:
+      - amd64
+      - arm64
+#dockers:
+#  - image_templates: ["ghcr.io/goreleaser/example:{{ .Version }}"]
+#    dockerfile: Dockerfile
+#    build_flag_templates:
+#      - --label=org.opencontainers.image.title={{ .ProjectName }}
+#      - --label=org.opencontainers.image.description={{ .ProjectName }}
+#      - --label=org.opencontainers.image.url=https://github.com/goreleaser/example
+#      - --label=org.opencontainers.image.source=https://github.com/goreleaser/example
+#      - --label=org.opencontainers.image.version={{ .Version }}
+#      - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
+#      - --label=org.opencontainers.image.revision={{ .FullCommit }}
+#      - --label=org.opencontainers.image.licenses=MIT
+#nfpms:
+#  - maintainer: Carlos A Becker <root@carlosbecker.dev>
+#    description: Sample project.
+#    homepage: https://github.com/caarlos0/tasktimer
+#    license: MIT
+#    formats:
+#      - deb
+#      - rpm
+#      - apk