Skip to content

Commit

Permalink
fixup! fix(deps): fix 32-bit errors with temporary fork
Browse files Browse the repository at this point in the history
  • Loading branch information
hairyhenderson committed Jun 23, 2024
1 parent 2ab0ee4 commit beb364f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
20 changes: 15 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,23 @@ jobs:
- run: make test
- run: make integration
linux-matrix-build:
runs-on: ubuntu-latest
strategy:
# let's let the other jobs continue
fail-fast: false
matrix:
platform: [ '386', 'amd64' ]
runner: [ 'ubuntu-latest' ]
goarm: [ '' ]
# include:
# - platform: 'arm'
# goarm: '7'
gocache: [ 'true' ]
include:
- platform: 'arm'
goarm: '7'
runner: 'ARM64'
gocache: 'false'
- platform: 'arm64'
runner: 'ARM64'
gocache: 'false'
runs-on: ${{ matrix.runner }}
env:
GOARCH: ${{ matrix.platform }}
GOARM: ${{ matrix.goarm }}
Expand All @@ -48,17 +55,20 @@ jobs:
fetch-depth: 0
- uses: actions/setup-go@v5
with:
cache: 'false'
go-version-file: go.mod
architecture: ${{ matrix.platform }}
# these are pre-installed on my self-hosted runners
- name: Install Consul & Vault
if: matrix.platform == 'amd64'
run: |
wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
sudo apt update
sudo apt install consul vault
- run: make build
- run: make test
- run: make integration
# - run: make integration
windows-build:
runs-on: windows-latest
env:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ build: $(PREFIX)/bin/$(PKG_NAME)_$(GOOS)-$(GOARCH)$(TARGETVARIANT)$(call extensi

# test with race detector on supported platforms
# windows/amd64 is supported in theory, but in practice it requires a C compiler
race_platforms := 'linux/amd64' 'linux/ppc64le' 'linux/arm64' 'linux/s390x' 'freebsd/amd64' 'netbsd/amd64' 'darwin/amd64' 'darwin/arm64'
race_platforms := 'linux/amd64' 'darwin/amd64' 'darwin/arm64'
ifeq (,$(findstring '$(GOOS)/$(GOARCH)',$(race_platforms)))
export CGO_ENABLED=0
test:
Expand Down

0 comments on commit beb364f

Please sign in to comment.