Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support arm64 and arm #315

Merged
merged 3 commits into from
Sep 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,20 @@ jobs:
strategy:
fail-fast: false
matrix:
goarch: ["amd64"] # ["arm", "amd64"]
include:
- goarch: "amd64"
gcc: "gcc"
package: ""
- goarch: "arm64"
gcc: "aarch64-linux-gnu-gcc"
package: "g++-aarch64-linux-gnu"
- goarch: "arm"
gcc: "arm-linux-gnueabi-gcc"
package: "g++-arm-linux-gnueabi"
timeout-minutes: 5
steps:
- run: sudo apt update && sudo apt install -y ${{ matrix.package }} qemu-user-binfmt
if: "matrix.package != ''"
- uses: actions/setup-go@v2
with:
go-version: "^1.15.4"
Expand All @@ -50,7 +61,7 @@ jobs:
go.mod
go.sum
- name: install
run: GOOS=linux GOARCH=${{ matrix.goarch }} make build
run: GOOS=linux GOARCH=${{ matrix.goarch }} CC=${{ matrix.gcc }} make build
if: "env.GIT_DIFF != ''"

tests:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- "v[0-9]+.[0-9]+.[0-9]+-rc*" # Push events to matching v*, i.e. v1.0-rc1, v20.15.10-rc5

jobs:
build:
build-docker:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
Expand Down Expand Up @@ -54,6 +54,6 @@ jobs:
with:
context: .
file: ./DOCKER/Dockerfile
platforms: linux/amd64 # linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
platforms: linux/amd64,linux/arm64
#push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.prep.outputs.tags }}
4 changes: 2 additions & 2 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Lint
name: Linter
on:
push:
paths:
Expand All @@ -10,7 +10,7 @@ on:
- "**.md"

jobs:
build:
build-linter:
name: Super linter
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/proto-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- cron: "* * 1 * *"

jobs:
build:
build-proto:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"

build:
build-abci:
name: Build
runs-on: ubuntu-latest
timeout-minutes: 5
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:

test_abci_apps:
runs-on: ubuntu-latest
needs: build
needs: build-abci
timeout-minutes: 5
steps:
- uses: actions/setup-go@v2
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:

test_abci_cli:
runs-on: ubuntu-latest
needs: build
needs: build-abci
timeout-minutes: 5
steps:
- uses: actions/setup-go@v2
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:

test_apps:
runs-on: ubuntu-latest
needs: build
needs: build-abci
timeout-minutes: 5
steps:
- uses: actions/setup-go@v2
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ sync-docs:
# Build linux binary on other platforms
# Should run from within a linux if CGO_ENABLED=1
build-linux:
GOOS=linux GOARCH=amd64 $(MAKE) build
GOOS=linux GOARCH=$(TARGET_ARCH) $(MAKE) build
.PHONY: build-linux

build-linux-docker:
Expand Down