From 97c7ba0b67a4b7f04488755cb93311c1bbac5ba2 Mon Sep 17 00:00:00 2001
From: MITSUNARI Shigeo <herumi@nifty.com>
Date: Thu, 4 Jan 2024 08:50:36 +0900
Subject: [PATCH] [win] use a library in release branch

---
 .github/workflows/main.yml | 52 +++++++++++++++++++++++++++-----------
 Makefile                   |  2 +-
 src/bls                    |  2 +-
 3 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2594c00..47d505a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,28 +2,50 @@ name: test
 on: [push]
 
 jobs:
-  build:
-    name: test
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+  Run-on-ubuntu:
+    name: Run on ubuntu
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-#    - run: go test -v ./bls
-    - run: git submodule update --init --recursive
-    - name: build on linux
-      if: runner.os == 'Linux'
-      run: |
+    - uses: actions/checkout@v4
+    - run: |
+        git submodule update --init --recursive
         sudo apt install nasm
         make clean
         make CXX=clang++
         go test -v ./bls
-    - name: build on mac
-      if: runner.os == 'macOS'
-      run: |
+
+  Run-on-macos:
+    name: Run on macos
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v4
+    - run: |
+        git submodule update --init --recursive
         brew install nasm
         make clean
         make
         go test -v ./bls
 
+  Run-on-windows:
+    name: Run on windows
+    runs-on: windows-latest
+    steps:
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: MINGW64
+        #msystem: UCRT64
+        update: true
+        platform-check-severity: warn
+        install: >-
+          make
+          python3
+          mingw-w64-x86_64-gcc
+          mingw-w64-x86_64-go
+    - uses: msys2/setup-msys2@v2
+    # - uses: actions/checkout@v4
+    - run: |
+        git clone -b release https://github.com/herumi/bls-eth-go-binary
+        cd bls-eth-go-binary
+        #git submodule update --init --recursive
+        #make MCL_STATIC_CODE=0
+        go test -v ./bls
diff --git a/Makefile b/Makefile
index 5fceb54..594b069 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SRC_DIR?=src/
 BLS_DIR?=$(SRC_DIR)/bls
 MCL_DIR?=$(BLS_DIR)/mcl
 all:
-	$(MAKE) -f $(BLS_DIR)/Makefile.onelib BLS_DIR=$(BLS_DIR) MCL_DIR=$(MCL_DIR) OUT_DIR=$(shell pwd) ARCH=$(ARCH) ETH_CFLAGS=$(ETH_CFLAGS) all
+	$(MAKE) -f $(BLS_DIR)/Makefile.onelib BLS_DIR=$(BLS_DIR) MCL_DIR=$(MCL_DIR) OUT_DIR=$(shell pwd) ETH_CFLAGS=$(ETH_CFLAGS) ARCH=$(ARCH) MCL_STATIC_CODE=$(MCL_STATIC_CODE) all
 ios:
 	$(MAKE) -f $(BLS_DIR)/Makefile.onelib BLS_DIR=$(BLS_DIR) MCL_DIR=$(MCL_DIR) OUT_DIR=$(shell pwd) ETH_CFLAGS=$(ETH_CFLAGS) ios
 ios_simulator:
diff --git a/src/bls b/src/bls
index eb3f104..ecf8c32 160000
--- a/src/bls
+++ b/src/bls
@@ -1 +1 @@
-Subproject commit eb3f1043d1eab3f018fcddc3cb3c2329fb17349a
+Subproject commit ecf8c32b58290443b585a097dd644c4ab8ccd2c1