oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-08-16 18:01:34 +00:00
Code Wiki Activity

Update Docker images (#524)

Browse source
This commit is contained in:
hackercat 2021-02-23 18:49:24 +01:00 • committed by GitHub
parent 14dac1d57a
commit cd42d0301a
10 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
act/runner/runner_test.go
View file

@ -74,7 +74,7 @@ func TestRunEvent(t *testing.T) {
} }
platforms := map[string]string{ platforms := map[string]string{
"ubuntu-latest": "node:12.6-buster-slim", "ubuntu-latest": "node:12.20.1-buster-slim",
} }
tables := []TestJobFileInfo{ tables := []TestJobFileInfo{
{"testdata", "basic", "push", "", platforms}, {"testdata", "basic", "push", "", platforms},
@ -113,7 +113,7 @@ func TestRunEventSecrets(t *testing.T) {
ctx := context.Background() ctx := context.Background()
platforms := map[string]string{ platforms := map[string]string{
"ubuntu-latest": "node:12.6-buster-slim", "ubuntu-latest": "node:12.20.1-buster-slim",
} }
workflowPath := "secrets" workflowPath := "secrets"
@ -154,7 +154,7 @@ func TestRunEventPullRequest(t *testing.T) {
ctx := context.Background() ctx := context.Background()
platforms := map[string]string{ platforms := map[string]string{
"ubuntu-latest": "node:12.6-buster-slim", "ubuntu-latest": "node:12.20.1-buster-slim",
} }
workflowPath := "pull-request" workflowPath := "pull-request"

2
act/runner/step_context_test.go
View file

@ -9,7 +9,7 @@ import (
func TestStepContextExecutor(t *testing.T) { func TestStepContextExecutor(t *testing.T) {
platforms := map[string]string{ platforms := map[string]string{
"ubuntu-latest": "node:12.6-buster-slim", "ubuntu-latest": "node:12.20.1-buster-slim",
} }
tables := []TestJobFileInfo{ tables := []TestJobFileInfo{
{"testdata", "uses-github-empty", "push", "Expected format {org}/{repo}[/path]@ref", platforms}, {"testdata", "uses-github-empty", "push", "Expected format {org}/{repo}[/path]@ref", platforms},

2
act/runner/testdata/actions/docker-local/Dockerfile vendored
View file

@ -1,5 +1,5 @@
# Container image that runs your code # Container image that runs your code
FROM alpine:3.10 FROM alpine:3.13
# Copies your code file from your action repository to the filesystem path `/` of the container # Copies your code file from your action repository to the filesystem path `/` of the container
COPY entrypoint.sh /entrypoint.sh COPY entrypoint.sh /entrypoint.sh

2
act/runner/testdata/actions/docker-url/action.yml vendored
View file

@ -8,7 +8,7 @@ inputs:
default: World default: World
runs: runs:
using: docker using: docker
#image: docker://alpine:3.8 #image: docker://alpine:3.13
image: docker://node:12-alpine image: docker://node:12-alpine
env: env:
TEST: enabled TEST: enabled

2
act/runner/testdata/basic/push.yml vendored
View file

@ -10,7 +10,7 @@ jobs:
steps: steps:
- run: echo ${{ env.TEST }} | grep value - run: echo ${{ env.TEST }} | grep value
- run: env - run: env
- uses: docker://alpine:3.8 - uses: docker://alpine:3.13
with: with:
somekey: ${{ env.TEST }} somekey: ${{ env.TEST }}
args: echo ${INPUT_SOMEKEY} | grep somevalue args: echo ${INPUT_SOMEKEY} | grep somevalue

2
act/runner/testdata/fail/push.yml vendored
View file

@ -5,7 +5,7 @@ jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: node:10.16-jessie image: node:12.20.1-buster
env: env:
TEST_ENV: test-value TEST_ENV: test-value
steps: steps:

4
act/runner/testdata/job-container/push.yml vendored
View file

@ -5,7 +5,7 @@ jobs:
test: test:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: node:10.16-jessie image: node:12.20.1-buster
env: env:
TEST_ENV: test-value TEST_ENV: test-value
steps: steps:
@ -13,7 +13,7 @@ jobs:
test2: test2:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: node:10.16-jessie container: node:12.20.1-buster
steps: steps:
- run: echo ${TEST_ENV} | grep test-value - run: echo ${TEST_ENV} | grep test-value
env: env:

2
act/runner/testdata/uses-docker-url/push.yml vendored
View file

@ -5,7 +5,7 @@ jobs:
test: test:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: docker://alpine:3.8 - uses: docker://alpine:3.13
with: with:
somekey: somevalue somekey: somevalue
args: echo ${INPUT_SOMEKEY} | grep somevalue args: echo ${INPUT_SOMEKEY} | grep somevalue

8
cmd/platforms.go
View file

@ -6,10 +6,10 @@ import (
func (i *Input) newPlatforms() map[string]string { func (i *Input) newPlatforms() map[string]string {
platforms := map[string]string{ platforms := map[string]string{
"ubuntu-latest": "node:12.6-buster-slim", "ubuntu-latest": "node:12.20.1-buster-slim",
"ubuntu-20.04": "node:12.6-buster-slim", "ubuntu-20.04": "node:12.20.1-buster-slim",
"ubuntu-18.04": "node:12.6-buster-slim", "ubuntu-18.04": "node:12.20.1-buster-slim",
"ubuntu-16.04": "node:12.6-stretch-slim", "ubuntu-16.04": "node:12.20.1-stretch-slim",
"windows-latest": "", "windows-latest": "",
"windows-2019": "", "windows-2019": "",
"macos-latest": "", "macos-latest": "",

2
cmd/root.go
View file

@ -220,7 +220,7 @@ func newRunCommand(ctx context.Context, input *Input) func(*cobra.Command, []str
case "Medium": case "Medium":
option = "-P ubuntu-latest=catthehacker/ubuntu:act-latest\n-P ubuntu-20.04=catthehacker/ubuntu:act-20.04\n-P ubuntu-18.04=catthehacker/ubuntu:act-18.04\nubuntu-16.04=catthehacker/ubuntu:act-16.04" option = "-P ubuntu-latest=catthehacker/ubuntu:act-latest\n-P ubuntu-20.04=catthehacker/ubuntu:act-20.04\n-P ubuntu-18.04=catthehacker/ubuntu:act-18.04\nubuntu-16.04=catthehacker/ubuntu:act-16.04"
case "Micro": case "Micro":
option = "-P ubuntu-latest=node:12.6-buster-slim\n-P ubuntu-20.04=node:12.6-buster-slim\n-P ubuntu-18.04=node:12.6-buster-slim\n-P ubuntu-16.04=node:12.6-stretch-slim" option = "-P ubuntu-latest=node:12.20.1-buster-slim\n-P ubuntu-20.04=node:12.20.1-buster-slim\n-P ubuntu-18.04=node:12.20.1-buster-slim\n-P ubuntu-16.04=node:12.20.1-stretch-slim"
} }
f, err := os.Create(actrc[0]) f, err := os.Create(actrc[0])