Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
herumi committed Jan 4, 2024
2 parents 59dab8e + fd8656f commit 774e9cc
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 17 deletions.
52 changes: 37 additions & 15 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/bls
Submodule bls updated 2 files
+7 −1 Makefile.onelib
+1 −1 mcl

0 comments on commit 774e9cc

Please sign in to comment.