Skip to content

Commit 99f28df

Browse files
RicYabenRicYaben
committed
Updated go mod and workflow
1 parent 4cfb32d commit 99f28df

4 files changed

Lines changed: 41 additions & 44 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,46 @@ name: release
33
on:
44
push:
55
paths-ignore:
6-
- '**.md'
6+
- "**.md"
77
pull_request:
88
paths-ignore:
9-
- '**.md'
9+
- "**.md"
1010

1111
jobs:
1212
build:
1313
strategy:
1414
matrix:
15-
go-version: [1.16]
15+
go-version: [1.18]
1616
os: [ubuntu-latest]
1717
runs-on: ${{ matrix.os }}
1818
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v2
1921

20-
- name: Checkout
21-
uses: actions/checkout@v2
22+
- name: Set up Go
23+
uses: actions/setup-go@v2
24+
with:
25+
go-version: ${{ matrix.go-version }}
2226

23-
- name: Set up Go
24-
uses: actions/setup-go@v2
25-
with:
26-
go-version: ${{ matrix.go-version }}
27+
- name: Cache Go modules
28+
uses: actions/cache@v1
29+
with:
30+
path: ~/go/pkg/mod
31+
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
32+
restore-keys: |
33+
${{ runner.os }}-go-
2734
28-
- name: Cache Go modules
29-
uses: actions/cache@v1
30-
with:
31-
path: ~/go/pkg/mod
32-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
33-
restore-keys: |
34-
${{ runner.os }}-go-
35+
- name: Build
36+
if: github.event_name == 'push' && (matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest')
37+
run: cd cmd/riotpot && go build -o bin/ -v
3538

36-
- name: Build
37-
if: github.event_name == 'push' && (matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest')
38-
run: cd cmd/riotpot && go build -o bin/ -v
39-
40-
# Autoreleaser https://goreleaser.com/ci/actions/
41-
# it MAY need secrets! more: https://docs.github.com/en/actions/reference/encrypted-secrets
42-
- name: Run GoReleaser
43-
uses: goreleaser/goreleaser-action@v2
44-
with:
45-
version: latest
46-
workdir: cmd/riotpot
47-
args: release --rm-dist
48-
env:
49-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
39+
# Autoreleaser https://goreleaser.com/ci/actions/
40+
# it MAY need secrets! more: https://docs.github.com/en/actions/reference/encrypted-secrets
41+
- name: Run GoReleaser
42+
uses: goreleaser/goreleaser-action@v2
43+
with:
44+
version: latest
45+
workdir: cmd/riotpot
46+
args: release --rm-dist
47+
env:
48+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎Makefile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,15 @@ riotpot-build-plugins: $(PLUGINS_DIR)/*
4040
done
4141
riotpot-build-local-plugin: $(PLUGINS_DIR)/*
4242
for folder in $^ ; do \
43-
go build -buildmode=plugin -o ${GO_BIN_DIR}/$${folder}/plugin.so $${folder}/*.go; \
43+
go build -buildmode=plugin -o ./$${folder}/plugin.so ./$${folder}/*.go; \
4444
done
4545

4646
riotpot-builder: \
47-
set_container_build \
4847
riotpot-build \
4948
riotpot-build-plugins
5049
riotpot-build-local: \
5150
riotpot-build \
5251
riotpot-build-local-plugin \
53-
go install ./riotpot
5452

5553
riotpot-install:
5654
riotpot-build \

‎go.mod‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,46 +16,46 @@ require (
1616

1717
require (
1818
github.com/davecgh/go-spew v1.1.1 // indirect
19+
github.com/dsnet/golib/memfile v1.0.0 // indirect
1920
github.com/gin-contrib/sse v0.1.0 // indirect
2021
github.com/go-playground/locales v0.14.0 // indirect
2122
github.com/go-playground/universal-translator v0.18.0 // indirect
2223
github.com/go-playground/validator/v10 v10.11.0 // indirect
2324
github.com/goccy/go-json v0.9.11 // indirect
2425
github.com/json-iterator/go v1.1.12 // indirect
2526
github.com/leodido/go-urn v1.2.1 // indirect
27+
github.com/mattn/go-isatty v0.0.16 // indirect
2628
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2729
github.com/modern-go/reflect2 v1.0.2 // indirect
2830
github.com/montanaflynn/stats v0.6.6 // indirect
2931
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
32+
github.com/pion/dtls/v2 v2.1.5 // indirect
33+
github.com/pion/logging v0.2.2 // indirect
34+
github.com/pion/udp v0.1.1 // indirect
35+
github.com/pkg/errors v0.9.1 // indirect
36+
github.com/plgd-dev/kit/v2 v2.0.0-20211006190727-057b33161b90 // indirect
3037
github.com/pmezard/go-difflib v1.0.0 // indirect
3138
github.com/ugorji/go/codec v1.2.7 // indirect
39+
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
40+
github.com/xdg-go/scram v1.1.1 // indirect
41+
github.com/xdg-go/stringprep v1.0.3 // indirect
42+
golang.org/x/text v0.3.7 // indirect
3243
google.golang.org/protobuf v1.28.1 // indirect
3344
gopkg.in/yaml.v2 v2.4.0 // indirect
3445
)
3546

3647
require (
37-
github.com/dsnet/golib/memfile v1.0.0 // indirect
3848
github.com/gin-gonic/gin v1.8.1
3949
github.com/golang/snappy v0.0.4 // indirect
4050
github.com/klauspost/compress v1.15.9 // indirect
4151
github.com/mattn/go-colorable v0.1.13 // indirect
42-
github.com/mattn/go-isatty v0.0.16 // indirect
43-
github.com/pion/dtls/v2 v2.1.5 // indirect
44-
github.com/pion/logging v0.2.2 // indirect
4552
github.com/pion/transport v0.13.1 // indirect
46-
github.com/pion/udp v0.1.1 // indirect
47-
github.com/pkg/errors v0.9.1 // indirect
48-
github.com/plgd-dev/kit/v2 v2.0.0-20211006190727-057b33161b90 // indirect
4953
github.com/rakyll/statik v0.1.7
5054
github.com/rs/zerolog v1.28.0
51-
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
52-
github.com/xdg-go/scram v1.1.1 // indirect
53-
github.com/xdg-go/stringprep v1.0.3 // indirect
5455
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
5556
go.uber.org/atomic v1.10.0 // indirect
5657
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91
5758
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b // indirect
5859
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
5960
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
60-
golang.org/x/text v0.3.7 // indirect
6161
)

‎riotpot‎

16.2 MB
Binary file not shown.

0 commit comments

Comments
 (0)