update gocore version to v.1.1.0 (#20)

* update gocore version to v.1.1.0 * update windows build
core-coin · Apr 22, 2022 · d1cc096 · d1cc096
1 parent f513784
commit d1cc096
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,16 +7,16 @@ jobs:
         platform: [
           {os: ubuntu-latest, path: linux-x86_64},
           {os: macos-latest, path: darwin-x86_64},
-          {os: ubuntu-latest, path: windows-x86_64},
+          {os: windows-latest, path: windows-x86_64},
         ]
     runs-on: ${{ matrix.platform.os }}
     steps:
+      - name: Checkout
+        uses: actions/checkout@v3
       - name: Setup
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v2
         with:
           go-version: 1.16.x
-      - name: Checkout
-        uses: actions/checkout@v1
       - name: Configure github for private modules
         shell: bash
         env:
@@ -26,15 +26,29 @@ jobs:
         if: matrix.platform.path == 'linux-x86_64' || matrix.platform.path == 'darwin-x86_64'
         run: |
           go build -o bin/wallet-generator main.go templates.go
+      - name: Setup MSYS
+        if: ${{ matrix.platform.path == 'windows-x86_64' }}
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: mingw64
+          update: true
+          install: >
+            git
+            base-devel
+            autoconf-wrapper
+            autoconf
+            automake
+            libtool
+            mingw-w64-x86_64-toolchain
+            mingw-w64-x86_64-go
       - name: Build for Windows
-        if: matrix.platform.path == 'windows-x86_64'
+        if: ${{ matrix.platform.path == 'windows-x86_64' }}
+        shell: msys2 {0}
+        env:
+          TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
         run: |
-          sudo apt install build-essential
-          sudo apt install git -y
-          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-          eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-          brew install mingw-w64
-          GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc-11.2.0 CXX=x86_64-w64-mingw32-gcc-11.2.0 go build -o bin/wallet-generator.exe -buildmode=exe main.go templates.go
+          git config --global url."https://error2215:${TOKEN}@github.com/core-coin/go-core".insteadOf "https://github.com/core-coin/go-core"
+          go build -o bin/wallet-generator.exe -buildmode=exe main.go templates.go
       - name: Upload
         uses: actions/upload-artifact@v2
         with:

diff --git a/go.mod b/go.mod
@@ -3,6 +3,6 @@ module github.com/core-coin/wallet-generator
 go 1.16
 
 require (
-	github.com/core-coin/go-core v1.1.0
+	github.com/core-coin/go-core v1.1.1
 	github.com/core-coin/go-goldilocks v1.0.9
 )
diff --git a/go.sum b/go.sum
@@ -60,6 +60,8 @@ github.com/core-coin/go-core v1.0.65 h1:vSTPwviEfHD3bLRnaAtzYgB5tBu2ohU0K2XSzMqW
 github.com/core-coin/go-core v1.0.65/go.mod h1:gTwqMxP9EdkVFVO8XYRw2IPYQR4gwTFW+v95UwcXDdw=
 github.com/core-coin/go-core v1.1.0 h1:VTRFt7JHV2pZ7I5ff7OAaVVPTON5rmrrboKP+wyXnMk=
 github.com/core-coin/go-core v1.1.0/go.mod h1:gTwqMxP9EdkVFVO8XYRw2IPYQR4gwTFW+v95UwcXDdw=
+github.com/core-coin/go-core v1.1.1 h1:r+2u5QtXAxA8lTfngXvsOCg/Yq+UnPRJT6YHUW/V40U=
+github.com/core-coin/go-core v1.1.1/go.mod h1:gTwqMxP9EdkVFVO8XYRw2IPYQR4gwTFW+v95UwcXDdw=
 github.com/core-coin/go-goldilocks v1.0.9 h1:NEX5+LXeLpj3yJPKQgEffj2ly33rOvANsWDcQR8jBUs=
 github.com/core-coin/go-goldilocks v1.0.9/go.mod h1:r6mSidt/OMBXorR8jBJYJttsver3m2EBAcSuf+m2Js0=
 github.com/core-coin/go-randomy v0.0.14/go.mod h1:7YzU3Hrss60CzXlzziTZNAQUN6u+eLAHH1cL1JRGLBE=