Skip to content

Commit

Permalink
Broken build hopefully no more (#221)
Browse files Browse the repository at this point in the history
* Add building linux pagage to test workflow
* fix new version of jquery inside the spec file
* go mod tidy
* version bump
  • Loading branch information
cviecco authored Apr 18, 2024
1 parent 64a5530 commit 41be3fa
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 175 deletions.
17 changes: 16 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
test:
strategy:
matrix:
go-version: [1.21.x]
go-version: [1.22.x]
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -13,4 +13,19 @@ jobs:
go-version: ${{ matrix.go-version }}
- uses: actions/checkout@v3
- run: make test
buildlinuxpackage:
strategy:
matrix:
go-version: [1.22.x]
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go-version }}
- uses: awalsh128/cache-apt-pkgs-action@latest
with:
packages: gcc rpm alien rsync pkg-config libudev-dev
- uses: actions/checkout@v3
- run: make init-config-host
- run: make rpm

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ endif
BINARY=keymaster

# These are the values we want to pass for Version and BuildTime
VERSION=1.15.2
VERSION=1.15.3
#BUILD_TIME=`date +%FT%T%z`

# keymaster client requires special tags on linux
Expand Down
5 changes: 0 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ require (
dario.cat/mergo v1.0.0 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/ProtonMail/go-crypto v1.0.0 // indirect
github.com/acomagu/bufpipe v1.0.4 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.6 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 // indirect
Expand All @@ -62,7 +61,6 @@ require (
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/skeema/knownhosts v1.2.2 // indirect
github.com/stretchr/testify v1.9.0 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
golang.org/x/sync v0.7.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
Expand All @@ -85,12 +83,10 @@ require (
github.com/flynn/hid v0.0.0-20190502022136-f1b9b6cc019a // indirect
github.com/fxamacker/cbor/v2 v2.6.0 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/certificate-transparency-go v1.1.8 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/lor00x/goldap v0.0.0-20180618054307-a546dffdd1a3 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.52.3 // indirect
Expand All @@ -100,7 +96,6 @@ require (
golang.org/x/sys v0.19.0 // indirect
golang.org/x/time v0.5.0
golang.org/x/tools v0.20.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
Expand Down
Loading

0 comments on commit 41be3fa

Please sign in to comment.