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 Sep 3, 2024
2 parents 9390510 + 9912b09 commit 80e8441
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 4 deletions.
22 changes: 20 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,32 @@ jobs:
make CXX=clang++
go test -v ./bls
Run-on-macos:
Run-on-Intel-macos:
name: Run on Intel macos
runs-on: macos-13
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.18.x'
- run: |
git submodule update --init --recursive
brew install nasm
make clean
make
go test -v ./bls
Run-on-ARM-macos:
name: Run on macos
# Intel Mac
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.18.x'
- run: |
git submodule update --init --recursive
brew install nasm
make clean
make
go test -v ./bls
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ jobs:
git config user.email [email protected]
git push --set-upstream origin release
build-linux:
runs-on: ubuntu-latest
# For Linux build we use an Ubuntu version that's as old as possible so that
# the generated artifacts are compatible with not-so-recent systems
runs-on: ubuntu-20.04
needs: create-branch
steps:
- name: Checkout code
Expand Down

0 comments on commit 80e8441

Please sign in to comment.