Skip to content

Commit 933e908

Browse files
raharperhallyn
authored andcommitted
Update go.mod and github build workflow actions
go.mod - x/crypto -> v0.36.0 - x/net -> v0.36.0 - gin-gonic -> v1.9.1 - protobuf -> v1.31.0 github/workflows/build - checkout -> v4 - setup-go -> v5 - upload-artifact -> v4 - action-gh-release -> v2 - convert to matrix runner to deal with upload-artifact v4 changes Signed-off-by: Ryan Harper <rharper@woxford.com>
1 parent 46630a8 commit 933e908

File tree

3 files changed

+108
-104
lines changed

3 files changed

+108
-104
lines changed

.github/workflows/build.yml

Lines changed: 24 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
1+
name: build
12
on:
23
push:
34
pull_request:
4-
name: build
55
jobs:
6-
build-amd64:
7-
name: build-amd64
8-
runs-on: ubuntu-22.04
6+
build:
7+
runs-on: ${{ matrix.os }}
8+
strategy:
9+
matrix:
10+
include:
11+
- os: ubuntu-22.04
12+
arch: amd64
13+
build: true
14+
- os: ubuntu-22.04-arm
15+
arch: arm64
16+
build: true
917
steps:
10-
- uses: actions/checkout@v3
18+
- name: Checkout source
19+
uses: actions/checkout@v4
1120
- name: Set up golang
12-
uses: actions/setup-go@v3
21+
uses: actions/setup-go@v5
1322
with:
1423
go-version: 1.23
1524
- name: Install build dependencies
@@ -19,46 +28,21 @@ jobs:
1928
- name: Make machine binaries
2029
run: |
2130
make
22-
mv bin/machine bin/machine-linux-amd64
23-
mv bin/machined bin/machined-linux-amd64
31+
mv bin/machine bin/machine-linux-${{matrix.arch}}
32+
mv bin/machined bin/machined-linux-${{matrix.arch}}
33+
ls -al bin/
2434
- name: Test machine unittests
2535
run: |
2636
make test
2737
- name: Upload artifacts
28-
uses: actions/upload-artifact@v3
38+
uses: actions/upload-artifact@v4
2939
with:
30-
name: binaries
31-
path: bin/
40+
name: machine-linux-${{matrix.arch}}
41+
path: bin/machine*-linux-${{matrix.arch}}
3242
if-no-files-found: error
3343
- name: Release
34-
uses: softprops/action-gh-release@v1
35-
if: startsWith(github.ref, 'refs/tags/')
36-
with:
37-
files: bin/machine*
38-
39-
build-arm64:
40-
name: build-arm64
41-
runs-on: ubuntu-latest
42-
steps:
43-
- uses: actions/checkout@v3
44-
- uses: uraimo/run-on-arch-action@v2
45-
with:
46-
arch: aarch64
47-
distro: ubuntu22.04
48-
49-
githubToken: ${{ github.token }}
50-
51-
install: |
52-
apt-get -y update;
53-
apt-get install -q -y git golang-go;
54-
apt-get install -y golang make
55-
run: |
56-
make
57-
mv bin/machine bin/machine-linux-arm64
58-
mv bin/machined bin/machined-linux-arm64
59-
make test
60-
- name: Release
61-
uses: softprops/action-gh-release@v1
44+
uses: softprops/action-gh-release@v2
6245
if: startsWith(github.ref, 'refs/tags/')
6346
with:
64-
files: bin/machine*
47+
name: machine-linux-${{matrix.arch}}
48+
path: bin/machine*-linux-${{matrix.arch}}

go.mod

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
module github.com/project-machine/machine
22

3-
go 1.23
3+
go 1.23.0
4+
5+
toolchain go1.24.2
46

57
require (
68
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
79
github.com/dustin/go-humanize v1.0.0
810
github.com/dustinkirkland/golang-petname v0.0.0-20191129215211-8e5a1ed0cff0
9-
github.com/gin-gonic/gin v1.8.1
11+
github.com/gin-gonic/gin v1.9.1
1012
github.com/go-resty/resty/v2 v2.7.0
1113
github.com/google/uuid v1.3.0
1214
github.com/lxc/lxd v0.0.0-20221130220346-2c77027b7a5e
@@ -18,46 +20,52 @@ require (
1820
github.com/sirupsen/logrus v1.9.0
1921
github.com/spf13/cobra v1.6.1
2022
github.com/spf13/viper v1.14.0
21-
golang.org/x/sys v0.28.0
23+
golang.org/x/sys v0.31.0
2224
gopkg.in/yaml.v2 v2.4.0
2325
)
2426

2527
require (
28+
github.com/bytedance/sonic v1.9.1 // indirect
29+
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
2630
github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3 // indirect
2731
github.com/fsnotify/fsnotify v1.6.0 // indirect
32+
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
2833
github.com/gin-contrib/sse v0.1.0 // indirect
29-
github.com/go-playground/locales v0.14.0 // indirect
30-
github.com/go-playground/universal-translator v0.18.0 // indirect
31-
github.com/go-playground/validator/v10 v10.10.0 // indirect
32-
github.com/goccy/go-json v0.9.7 // indirect
34+
github.com/go-playground/locales v0.14.1 // indirect
35+
github.com/go-playground/universal-translator v0.18.1 // indirect
36+
github.com/go-playground/validator/v10 v10.14.0 // indirect
37+
github.com/goccy/go-json v0.10.2 // indirect
3338
github.com/gorilla/websocket v1.5.0 // indirect
3439
github.com/hashicorp/hcl v1.0.0 // indirect
3540
github.com/inconshreveable/mousetrap v1.0.1 // indirect
3641
github.com/json-iterator/go v1.1.12 // indirect
3742
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
38-
github.com/leodido/go-urn v1.2.1 // indirect
43+
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
44+
github.com/leodido/go-urn v1.2.4 // indirect
3945
github.com/magiconair/properties v1.8.6 // indirect
40-
github.com/mattn/go-isatty v0.0.16 // indirect
46+
github.com/mattn/go-isatty v0.0.19 // indirect
4147
github.com/mitchellh/mapstructure v1.5.0 // indirect
4248
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4349
github.com/modern-go/reflect2 v1.0.2 // indirect
4450
github.com/pborman/uuid v1.2.1 // indirect
4551
github.com/pelletier/go-toml v1.9.5 // indirect
46-
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
52+
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
4753
github.com/pkg/xattr v0.4.9 // indirect
4854
github.com/robfig/cron/v3 v3.0.1 // indirect
4955
github.com/spf13/afero v1.9.3 // indirect
5056
github.com/spf13/cast v1.5.0 // indirect
5157
github.com/spf13/jwalterweatherman v1.1.0 // indirect
5258
github.com/spf13/pflag v1.0.5 // indirect
5359
github.com/subosito/gotenv v1.4.1 // indirect
54-
github.com/ugorji/go/codec v1.2.7 // indirect
60+
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
61+
github.com/ugorji/go/codec v1.2.11 // indirect
5562
github.com/yourbasic/bit v0.0.0-20180313074424-45a4409f4082 // indirect
56-
golang.org/x/crypto v0.31.0 // indirect
57-
golang.org/x/net v0.33.0 // indirect
58-
golang.org/x/term v0.27.0 // indirect
59-
golang.org/x/text v0.21.0 // indirect
60-
google.golang.org/protobuf v1.28.1 // indirect
63+
golang.org/x/arch v0.3.0 // indirect
64+
golang.org/x/crypto v0.36.0 // indirect
65+
golang.org/x/net v0.36.0 // indirect
66+
golang.org/x/term v0.30.0 // indirect
67+
golang.org/x/text v0.23.0 // indirect
68+
google.golang.org/protobuf v1.33.0 // indirect
6169
gopkg.in/ini.v1 v1.67.0 // indirect
6270
gopkg.in/yaml.v3 v3.0.1 // indirect
6371
)

0 commit comments

Comments
 (0)