支持GitHub托管的运行器macos的构建 (#97)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 44419bb20a1caf5a8f4702b8de3c5d30e963803d..a64d4d7dbb0b675e8992ed3a049642b4607771c1 100644 (file)
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -75,7 +75,7 @@ jobs:
         git rev-parse --short HEAD > CV/VERSION
         cd demo
         go get .
-        CGO_ENABLED=0 go build -pgo=auto -v -buildmode=exe -o demo.run main.go
+        CGO_ENABLED=0 go build -pgo=auto -v -buildmode=exe main.go
       
     - name: zip
       run: zip -q -r ubuntu_go${{ matrix.go }}.zip demo
@@ -115,7 +115,7 @@ jobs:
         cd demo
         set CGO_ENABLED=0
         go get .
-        go build -pgo=auto -v -buildmode=exe -o demo.exe main.go
+        go build -pgo=auto -v -buildmode=exe main.go
         
     - name: zip
       run: .\7za.exe a -r .\windows_go${{ matrix.go }}.zip ./demo
@@ -126,3 +126,43 @@ jobs:
         draft: true
         files: |
           ./windows_go${{ matrix.go }}.zip
+
+  m-build:
+    name: build_macos_go${{ matrix.go }}
+    needs: [buildtest]
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        go: [ '1.21' ]
+    steps:
+    - name: Set up Go${{ matrix.go }}
+      uses: actions/setup-go@v4
+      with:
+        go-version: ${{ matrix.go }}
+
+    - name: Check out code
+      uses: actions/checkout@v4
+      with:
+        lfs: true
+
+    - name: Checkout LFS objects
+      run: git lfs checkout
+
+
+    - name: Build
+      run: |
+        git rev-parse --short HEAD > CV/VERSION
+        cd demo
+        set CGO_ENABLED=0
+        go get .
+        go build -pgo=auto -v -buildmode=exe main.go
+        
+    - name: zip
+      run: zip -q -r macos_go${{ matrix.go }}.zip demo
+
+    - name: Upload a Release Asset
+      uses: softprops/action-gh-release@v1
+      with:
+        draft: true
+        files: |
+          ./macos_go${{ matrix.go }}.zip

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 33a43a72bb9ff77e3cede2fda68c4a28229ea20f..de36d42cce17be87d8b41b1b06977255837f5a6a 100644 (file)
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -79,7 +79,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install libgtk-3-dev libcairo2-dev libglib2.0-dev
         go get .
-        CGO_ENABLED=0 go build -pgo=auto -v -buildmode=exe -o demo.run main.go
+        CGO_ENABLED=0 go build -pgo=auto -v -buildmode=exe main.go
       
     - name: zip
       run: zip -q -r ubuntu_go${{ matrix.go }}.zip demo
@@ -117,7 +117,7 @@ jobs:
         cd demo
         go get .
         set CGO_ENABLED=0
-        go build -pgo=auto -v -buildmode=exe -o demo.exe main.go
+        go build -pgo=auto -v -buildmode=exe main.go
         
     - name: zip
       run: .\7za.exe a -r .\windows_go${{ matrix.go }}.zip ./demo
@@ -126,3 +126,41 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         path: ./windows_go${{ matrix.go }}.zip
+       
+  mac-build:
+    name: build_macos_go${{ matrix.go }}
+    needs: [buildtest]
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        go: [ '1.21' ]
+    steps:
+    - name: Set up Go${{ matrix.go }}
+      uses: actions/setup-go@v4
+      with:
+        go-version: ${{ matrix.go }}
+
+    - name: Check out code
+      uses: actions/checkout@v4
+      with:
+        lfs: true
+
+    - name: Checkout LFS objects
+      run: git lfs checkout
+
+
+    - name: Build
+      run: |
+        git rev-parse --short HEAD > CV/VERSION
+        cd demo
+        go get .
+        set CGO_ENABLED=0
+        go build -pgo=auto -v -buildmode=exe main.go
+        
+    - name: zip
+      run: zip -q -r macos_go${{ matrix.go }}.zip demo
+      
+    - name: Upload a Build Artifact
+      uses: actions/upload-artifact@v3
+      with:
+        path: ./macos_go${{ matrix.go }}.zip

diff --git a/go.mod b/go.mod
index eaa685a7e28f70bfc15271f7cfd98fcaf14a36b3..6c384284abf9a0961b231b401e18a8d08ae32354 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.21
 require (
        github.com/gotk3/gotk3 v0.6.2
        github.com/mdp/qrterminal/v3 v3.2.0
-       github.com/qydysky/part v0.28.20240102141717
+       github.com/qydysky/part v0.28.20240105153534
        github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
        github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
        golang.org/x/text v0.14.0
@@ -13,14 +13,14 @@ require (
 
 require (
        github.com/google/uuid v1.5.0
-       golang.org/x/exp v0.0.0-20231226003508-02704c960a9b
+       golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
 )
 
 require (
        github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
        github.com/mattn/go-isatty v0.0.20 // indirect
        github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-       golang.org/x/term v0.15.0 // indirect
+       golang.org/x/term v0.16.0 // indirect
        lukechampine.com/uint128 v1.3.0 // indirect
        modernc.org/cc/v3 v3.41.0 // indirect
        modernc.org/ccgo/v3 v3.16.15 // indirect
@@ -49,7 +49,7 @@ require (
        github.com/yusufpapurcu/wmi v1.2.3 // indirect
        golang.org/x/mod v0.14.0 // indirect
        golang.org/x/net v0.19.0 // indirect
-       golang.org/x/sys v0.15.0 // indirect
+       golang.org/x/sys v0.16.0 // indirect
        golang.org/x/tools v0.16.1 // indirect
        gopkg.in/yaml.v3 v3.0.1 // indirect
        modernc.org/sqlite v1.28.0

diff --git a/go.sum b/go.sum
index b55b5c072ef60286207d2901b600ecdf9f3f7899..d9e7bd57e9077fce26fa65c3ec883650f5ed31df 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -35,8 +35,8 @@ github.com/miekg/dns v1.1.57 h1:Jzi7ApEIzwEPLHWRcafCN9LZSBbqQpxjt/wpgvg7wcM=
 github.com/miekg/dns v1.1.57/go.mod h1:uqRjCRUuEAA6qsOiJvDd+CFo/vW+y5WR6SNmHE55hZk=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/qydysky/part v0.28.20240102141717 h1:nWBBYIKjQPFXuh4OlfGFDV8ZicKY09865+Ukp92wlRs=
-github.com/qydysky/part v0.28.20240102141717/go.mod h1:NyKyjpBCSjcHtKlC+fL5lCidm57UCnwEgufiBDs5yxA=
+github.com/qydysky/part v0.28.20240105153534 h1:tOYk+oRfsP5PJB0ggnhijNuIU4jAD7YhwOKuKY3CKkc=
+github.com/qydysky/part v0.28.20240105153534/go.mod h1:NyKyjpBCSjcHtKlC+fL5lCidm57UCnwEgufiBDs5yxA=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
@@ -55,8 +55,8 @@ github.com/tklauser/numcpus v0.7.0 h1:yjuerZP127QG9m5Zh/mSO4wqurYil27tHrqwRoRjpr
 github.com/tklauser/numcpus v0.7.0/go.mod h1:bb6dMVcj8A42tSE7i32fsIUCbQNllK5iDguyOZRUzAY=
 github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=
 github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-golang.org/x/exp v0.0.0-20231226003508-02704c960a9b h1:kLiC65FbiHWFAOu+lxwNPujcsl8VYyTYYEZnsOO1WK4=
-golang.org/x/exp v0.0.0-20231226003508-02704c960a9b/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
+golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM=
+golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
 golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
 golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
@@ -66,10 +66,10 @@ golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
-golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
+golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=