Skip to content

Commit 22d91e3

Browse files
committed
Merge tag 'nektos/v0.2.49'
Conflicts: cmd/input.go go.mod go.sum pkg/exprparser/interpreter.go pkg/model/workflow.go pkg/runner/expression.go pkg/runner/job_executor.go pkg/runner/runner.go
2 parents cdc6d4b + d5d8548 commit 22d91e3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+589
-334
lines changed

.github/actions/run-tests/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ runs:
5454
}
5555
}
5656
};
57-
var args = ['test', '-v', '-cover', '-coverprofile=coverage.txt', '-covermode=atomic', '-timeout', '15m'];
57+
var args = ['test', '-v', '-cover', '-coverprofile=coverage.txt', '-covermode=atomic', '-timeout', '20m'];
5858
var filter = process.env.FILTER;
5959
if(filter) {
6060
args.push('-run');

.github/workflows/checks.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ concurrency:
88
env:
99
ACT_OWNER: ${{ github.repository_owner }}
1010
ACT_REPOSITORY: ${{ github.repository }}
11-
GO_VERSION: 1.18
1211
CGO_ENABLED: 0
1312

1413
jobs:
@@ -21,12 +20,13 @@ jobs:
2120
fetch-depth: 0
2221
- uses: actions/setup-go@v4
2322
with:
24-
go-version: ${{ env.GO_VERSION }}
23+
go-version-file: go.mod
2524
check-latest: true
26-
- uses: golangci/golangci-lint-action@v3.4.0
25+
- uses: golangci/golangci-lint-action@v3.6.0
2726
with:
28-
version: v1.47.2
29-
- uses: megalinter/megalinter/flavors/[email protected]
27+
version: v1.53
28+
only-new-issues: true
29+
- uses: megalinter/megalinter/flavors/[email protected]
3030
env:
3131
DEFAULT_BRANCH: master
3232
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -45,7 +45,7 @@ jobs:
4545
uses: docker/setup-qemu-action@v2
4646
- uses: actions/setup-go@v4
4747
with:
48-
go-version: ${{ env.GO_VERSION }}
48+
go-version-file: go.mod
4949
check-latest: true
5050
- uses: actions/cache@v3
5151
if: ${{ !env.ACT }}
@@ -80,7 +80,7 @@ jobs:
8080
fetch-depth: 2
8181
- uses: actions/setup-go@v4
8282
with:
83-
go-version: ${{ env.GO_VERSION }}
83+
go-version-file: go.mod
8484
check-latest: true
8585
- name: Run Tests
8686
uses: ./.github/actions/run-tests
@@ -95,7 +95,7 @@ jobs:
9595
- uses: actions/checkout@v3
9696
- uses: actions/setup-go@v4
9797
with:
98-
go-version: ${{ env.GO_VERSION }}
98+
go-version-file: go.mod
9999
check-latest: true
100100
- uses: actions/cache@v3
101101
if: ${{ !env.ACT }}
@@ -108,7 +108,7 @@ jobs:
108108
uses: goreleaser/goreleaser-action@v4
109109
with:
110110
version: latest
111-
args: release --snapshot --rm-dist
111+
args: release --snapshot --clean
112112
- name: Capture x86_64 (64-bit) Linux binary
113113
if: ${{ !env.ACT }}
114114
uses: actions/upload-artifact@v3

.github/workflows/promote.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ on:
44
- cron: '0 2 1 * *'
55
workflow_dispatch: {}
66

7-
env:
8-
GO_VERSION: 1.18
9-
107
jobs:
118
release:
129
name: promote
@@ -20,7 +17,7 @@ jobs:
2017
- uses: fregante/setup-git-user@v2
2118
- uses: actions/setup-go@v4
2219
with:
23-
go-version: ${{ env.GO_VERSION }}
20+
go-version-file: go.mod
2421
check-latest: true
2522
- uses: actions/cache@v3
2623
if: ${{ !env.ACT }}

.github/workflows/release.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ on:
44
tags:
55
- v*
66

7-
env:
8-
GO_VERSION: 1.18
9-
107
jobs:
118
release:
129
name: release
@@ -17,7 +14,7 @@ jobs:
1714
fetch-depth: 0
1815
- uses: actions/setup-go@v4
1916
with:
20-
go-version: ${{ env.GO_VERSION }}
17+
go-version-file: go.mod
2118
check-latest: true
2219
- uses: actions/cache@v3
2320
if: ${{ !env.ACT }}
@@ -30,7 +27,7 @@ jobs:
3027
uses: goreleaser/goreleaser-action@v4
3128
with:
3229
version: latest
33-
args: release --rm-dist
30+
args: release --clean
3431
env:
3532
GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
3633
- name: Chocolatey

.golangci.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,15 @@ linters-settings:
1919
- pkg: 'github.com/stretchr/testify/assert'
2020
alias: assert
2121
depguard:
22-
list-type: blacklist
23-
include-go-root: true
24-
packages:
25-
- github.com/pkg/errors
26-
- gotest.tools/v3/assert
27-
- log
28-
packages-with-error-message:
29-
- github.com/pkg/errors: 'Please use "errors" package from standard library'
30-
- gotest.tools/v3: 'Please keep tests unified using only github.com/stretchr/testify'
31-
- log: 'Please keep logging unified using only github.com/sirupsen/logrus'
32-
22+
rules:
23+
main:
24+
deny:
25+
- pkg: github.com/pkg/errors
26+
desc: Please use "errors" package from standard library
27+
- pkg: gotest.tools/v3
28+
desc: Please keep tests unified using only github.com/stretchr/testify
29+
- pkg: log
30+
desc: Please keep logging unified using only github.com/sirupsen/logrus
3331
linters:
3432
enable:
3533
- megacheck

.goreleaser.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ builds:
2222
checksum:
2323
name_template: 'checksums.txt'
2424
archives:
25-
- name_template: '{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
26-
replacements:
27-
darwin: Darwin
28-
linux: Linux
29-
windows: Windows
30-
386: i386
31-
amd64: x86_64
25+
- name_template: >-
26+
{{ .ProjectName }}_
27+
{{- title .Os }}_
28+
{{- if eq .Arch "amd64" }}x86_64
29+
{{- else if eq .Arch "386" }}i386
30+
{{- else }}{{ .Arch }}{{ end }}
31+
{{- if .Arm }}v{{ .Arm }}{{ end }}
3232
format_overrides:
3333
- goos: windows
3434
format: zip

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ endif
106106
.PHONY: snapshot
107107
snapshot:
108108
goreleaser build \
109-
--rm-dist \
109+
--clean \
110110
--single-target \
111111
--snapshot
112112

README.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ If your workflow depends on this token, you need to create a [personal access to
217217
act -s GITHUB_TOKEN=[insert token or leave blank and omit equals for secure input]
218218
```
219219

220-
If [GitHub CLI](https://cli.github.com/) is installed, the [`gh auth token`](https://cli.github.com/manual/gh_auth_token) command can be used to autmatically pass the token to act
220+
If [GitHub CLI](https://cli.github.com/) is installed, the [`gh auth token`](https://cli.github.com/manual/gh_auth_token) command can be used to automatically pass the token to act
221221

222222
```bash
223223
act -s GITHUB_TOKEN="$(gh auth token)"
@@ -297,6 +297,15 @@ If you need an environment that works just like the corresponding GitHub runner
297297

298298
- [`catthehacker/ubuntu:full-*`](https://github.com/catthehacker/docker_images/pkgs/container/ubuntu) - built from Packer template provided by GitHub, see [catthehacker/virtual-environments-fork](https://github.com/catthehacker/virtual-environments-fork) or [catthehacker/docker_images](https://github.com/catthehacker/docker_images) for more information
299299

300+
## Using local runner images
301+
302+
The `--pull` flag is set to true by default due to a breaking on older default docker images. This would pull the docker image everytime act is executed.
303+
304+
Set `--pull` to false if a local docker image is needed
305+
```sh
306+
act --pull=false
307+
```
308+
300309
## Use an alternative runner image
301310

302311
To use a different image for the runner, use the `-P` option.
@@ -485,7 +494,7 @@ Want to contribute to act? Awesome! Check out the [contributing guidelines](CONT
485494

486495
## Manually building from source
487496

488-
- Install Go tools 1.18+ - (<https://golang.org/doc/install>)
497+
- Install Go tools 1.20+ - (<https://golang.org/doc/install>)
489498
- Clone this repo `git clone [email protected]:nektos/act.git`
490499
- Run unit tests with `make test`
491500
- Build and install: `make install`

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.2.46
1+
0.2.49

cmd/input.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ type Input struct {
5555
replaceGheActionTokenWithGithubCom string
5656
matrix []string
5757
actionCachePath string
58+
logPrefixJobID bool
5859
}
5960

6061
func (i *Input) resolve(path string) string {

0 commit comments

Comments
 (0)