Skip to content

Commit b696c2d

Browse files
dependabot[bot]blaubaer
dependabot[bot]
and
blaubaer
authored
Bump actions/setup-go from 5 to 6 (#81)
* Bump actions/setup-go from 5 to 6 Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5 to 6. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v5...v6) --- updated-dependencies: - dependency-name: actions/setup-go dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Adjusted picking of Go SDK versions * Adjusted picking of Go SDK versions * 1. Fix go environment while building manual 2. Adjusted picking of Go SDK versions --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gregor Noczinski <gregor@noczinski.eu>
1 parent 7bab7e8 commit b696c2d

File tree

6 files changed

+87
-77
lines changed

6 files changed

+87
-77
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 20 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- 'v*.*.*'
66
- 'snapshot-*'
77
branches:
8-
- '**'
8+
- 'main'
99
pull_request:
1010
jobs:
1111
lint:
@@ -15,23 +15,14 @@ jobs:
1515
os: [ ubuntu-latest, macos-latest, windows-latest ]
1616
runs-on: ${{ matrix.os }}
1717
steps:
18-
- name: Install Go
19-
uses: actions/setup-go@v5
20-
with:
21-
go-version: 'stable'
22-
check-latest: true
23-
2418
- name: Checkout
2519
uses: actions/checkout@v5
2620

27-
- name: Cache
28-
uses: actions/cache@v4
21+
- name: Install Go
22+
uses: actions/setup-go@v6
2923
with:
30-
path: |
31-
~/go/pkg/mod
32-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
33-
restore-keys: |
34-
${{ runner.os }}-go-
24+
go-version-file: go.mod
25+
check-latest: true
3526

3627
- name: Install dependencies
3728
run: |
@@ -48,28 +39,21 @@ jobs:
4839
4940
test:
5041
name: "Test"
42+
permissions:
43+
contents: write
5144
strategy:
5245
matrix:
5346
os: [ ubuntu-latest, macos-latest, windows-latest ]
5447
runs-on: ${{ matrix.os }}
5548
steps:
56-
- name: Install Go
57-
uses: actions/setup-go@v5
58-
with:
59-
go-version: '1.23'
60-
check-latest: true
61-
6249
- name: Checkout
6350
uses: actions/checkout@v5
6451

65-
- name: Cache
66-
uses: actions/cache@v4
52+
- name: Install Go
53+
uses: actions/setup-go@v6
6754
with:
68-
path: |
69-
~/go/pkg/mod
70-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
71-
restore-keys: |
72-
${{ runner.os }}-go-
55+
go-version-file: go.mod
56+
check-latest: true
7357

7458
- name: Install dependencies
7559
run: |
@@ -82,6 +66,14 @@ jobs:
8266
run: |
8367
go run ./build test
8468
69+
- name: Upload generated manuals
70+
uses: actions/upload-artifact@v4
71+
with:
72+
if-no-files-found: error
73+
name: "manuals-${{ matrix.os }}"
74+
path: |
75+
var/manuals/*.html
76+
8577
- name: Send coverage
8678
env:
8779
COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -95,20 +87,10 @@ jobs:
9587
runs-on: ubuntu-latest
9688
steps:
9789
- name: Install Go
98-
uses: actions/setup-go@v5
90+
uses: actions/setup-go@v6
9991
with:
100-
go-version: 'stable'
10192
check-latest: true
10293

103-
- name: Cache
104-
uses: actions/cache@v4
105-
with:
106-
path: |
107-
~/go/pkg/mod
108-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
109-
restore-keys: |
110-
${{ runner.os }}-go-
111-
11294
- name: Install goveralls
11395
run: go install github.com/mattn/goveralls@latest
11496

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,14 @@ jobs:
99
name: "Release"
1010
runs-on: ubuntu-latest
1111
steps:
12-
- name: Set up Go
13-
uses: actions/setup-go@v5
14-
with:
15-
go-version: '1.23'
16-
check-latest: true
17-
1812
- name: Checkout
1913
uses: actions/checkout@v5
2014

21-
- name: Cache
22-
uses: actions/cache@v4
15+
- name: Set up Go
16+
uses: actions/setup-go@v6
2317
with:
24-
path: |
25-
~/go/pkg/mod
26-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
27-
restore-keys: |
28-
${{ runner.os }}-go-
18+
go-version-file: go.mod
19+
check-latest: true
2920

3021
- name: Get dependencies
3122
run: |

‎go.mod‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
go 1.24.0
1+
go 1.25.0
22

33
module github.com/echocat/caretakerd
44

@@ -16,11 +16,17 @@ require (
1616
)
1717

1818
require (
19-
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
19+
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
2020
github.com/jmcvetta/randutil v0.0.0-20150817122601-2bb1b664bcff // indirect
2121
github.com/kr/pretty v0.3.1 // indirect
2222
github.com/kr/text v0.2.0 // indirect
23-
github.com/rogpeppe/go-internal v1.12.0 // indirect
23+
github.com/rogpeppe/go-internal v1.14.1 // indirect
2424
github.com/tdewolff/parse/v2 v2.8.3 // indirect
2525
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
2626
)
27+
28+
ignore (
29+
.github
30+
.idea
31+
var
32+
)

‎go.sum‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github.com/alecthomas/kingpin/v2 v2.4.0 h1:f48lwail6p8zpO1bC4TxtqACaGqHYA22qkHjHpqDjYY=
22
github.com/alecthomas/kingpin/v2 v2.4.0/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE=
3-
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 h1:ez/4by2iGztzR4L0zgAOR8lTQK9VlyBVVd7G4omaOQs=
4-
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
3+
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b h1:mimo19zliBX/vSQ6PWWSL9lK8qwHozUj03+zLoEB8O0=
4+
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b/go.mod h1:fvzegU4vN3H1qMT+8wDmzjAcDONcgo2/SZ/TyfdUOFs=
55
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
66
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
77
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -23,14 +23,19 @@ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsK
2323
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2424
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
2525
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
26-
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
27-
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
26+
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
27+
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
2828
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
2929
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
3030
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
31-
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
32-
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
33-
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
31+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
32+
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
33+
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
34+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
35+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
36+
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
37+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
38+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
3439
github.com/tdewolff/minify/v2 v2.24.3 h1:BaKgWSFLKbKDiUskbeRgbe2n5d1Ci1x3cN/eXna8zOA=
3540
github.com/tdewolff/minify/v2 v2.24.3/go.mod h1:1JrCtoZXaDbqioQZfk3Jdmr0GPJKiU7c1Apmb+7tCeE=
3641
github.com/tdewolff/parse/v2 v2.8.3 h1:5VbvtJ83cfb289A1HzRA9sf02iT8YyUwN84ezjkdY1I=
@@ -48,6 +53,6 @@ gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST
4853
gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
4954
gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5 h1:E846t8CnR+lv5nE+VuiKTDG/v1U2stad0QzddfJC7kY=
5055
gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5/go.mod h1:hiOFpYm0ZJbusNj2ywpbrXowU3G8U6GIQzqn2mw1UIE=
51-
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
56+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
5257
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
5358
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎manual/definitionsParser.go‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ package main
22

33
import (
44
"fmt"
5-
"github.com/echocat/caretakerd/errors"
6-
"github.com/echocat/caretakerd/logger"
7-
"github.com/echocat/caretakerd/panics"
8-
"github.com/echocat/caretakerd/system"
95
"go/ast"
106
"go/build"
117
"go/importer"
@@ -16,8 +12,12 @@ import (
1612
"path/filepath"
1713
"reflect"
1814
"regexp"
19-
"runtime"
2015
"strings"
16+
17+
"github.com/echocat/caretakerd/errors"
18+
"github.com/echocat/caretakerd/logger"
19+
"github.com/echocat/caretakerd/panics"
20+
"github.com/echocat/caretakerd/system"
2121
)
2222

2323
var extractIDPropertyPattern = regexp.MustCompile("(?m)^\\s*@id\\s+(.*)\\s*(:?\r\n|\n)")
@@ -148,12 +148,12 @@ func (instance *extractionTask) ImportFrom(packageName, packageSource string, mo
148148
return pkg, err
149149
}
150150

151-
buildPkg, err := build.Import(packageName, packageSource, build.ImportComment)
151+
buildPkg, err := instance.context.Import(packageName, packageSource, build.ImportComment)
152152
if err != nil {
153153
if !instance.isPartOfGoPathPkgMod(packageSource) {
154154
return nil, err
155155
}
156-
buildPkg, err = build.Import(packageName, instance.project.SrcRootPath, build.ImportComment)
156+
buildPkg, err = instance.context.Import(packageName, instance.project.SrcRootPath, build.ImportComment)
157157
if err != nil {
158158
return nil, err
159159
}
@@ -170,6 +170,11 @@ func (instance *extractionTask) ImportFrom(packageName, packageSource string, mo
170170
return nil, err
171171
}
172172

173+
defaultBC := build.Default
174+
build.Default = *instance.context
175+
defer func() {
176+
build.Default = defaultBC
177+
}()
173178
pp.pkg, err = instance.typesConfig.Check(buildPkg.ImportPath, pp.fileSet, astFiles, instance.info)
174179
if err != nil {
175180
return nil, err
@@ -208,12 +213,16 @@ func ParseDefinitions(project Project) (*Definitions, error) {
208213
packageNameToParsedPackage: make(map[string]*parsedPackage),
209214
project: project,
210215
context: &build.Context{
211-
GOARCH: runtime.GOARCH,
212-
GOOS: runtime.GOOS,
213-
GOROOT: GOROOT,
214-
GOPATH: GOPATH,
215-
Compiler: runtime.Compiler,
216-
CgoEnabled: false,
216+
GOARCH: "amd64",
217+
GOOS: "linux",
218+
GOROOT: GOROOT,
219+
GOPATH: GOPATH,
220+
Dir: project.SrcRootPath,
221+
Compiler: "gc",
222+
CgoEnabled: false,
223+
BuildTags: build.Default.BuildTags,
224+
ToolTags: build.Default.ToolTags,
225+
ReleaseTags: build.Default.ReleaseTags,
217226
},
218227
definitions: NewDefinitions(project),
219228
typesConfig: types.Config{

‎manual/project.go‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,32 @@ package main
22

33
import (
44
"encoding/json"
5+
"go/build"
56
"os"
67
"path/filepath"
78
)
89

910
// GOPATH points the current GOPATH.
10-
var GOPATH = os.Getenv("GOPATH")
11+
var GOPATH = func() string {
12+
if v := os.Getenv("GOPATHX"); v != "" {
13+
return v
14+
}
15+
if v := os.Getenv("GOPATH"); v != "" {
16+
return v
17+
}
18+
return build.Default.GOPATH
19+
}()
1120

1221
// GOROOT points the the current GOROOT.
13-
var GOROOT = os.Getenv("GOROOT")
22+
var GOROOT = func() string {
23+
if v := os.Getenv("GOROOTX"); v != "" {
24+
return v
25+
}
26+
if v := os.Getenv("GOROOT"); v != "" {
27+
return v
28+
}
29+
return build.Default.GOROOT
30+
}()
1431
var GOROOTSRC, _ = filepath.Abs(GOROOT + "/src/")
1532

1633
// Project represents a Go project and its sources.

0 commit comments

Comments
 (0)