diff --git a/act/runner/runner_test.go b/act/runner/runner_test.go index 2b9c461e..796038b8 100644 --- a/act/runner/runner_test.go +++ b/act/runner/runner_test.go @@ -407,6 +407,7 @@ func TestRunner_DockerActionForcePullForceRebuild(t *testing.T) { } func TestRunner_RunDifferentArchitecture(t *testing.T) { + t.Skip("Flaky see https://code.forgejo.org/forgejo/runner/issues/763") if testing.Short() { t.Skip("skipping integration test") } diff --git a/act/runner/testdata/actions/action1/Dockerfile b/act/runner/testdata/actions/action1/Dockerfile index 311a4a0b..0eb4029d 100644 --- a/act/runner/testdata/actions/action1/Dockerfile +++ b/act/runner/testdata/actions/action1/Dockerfile @@ -1 +1 @@ -FROM ubuntu:18.04 \ No newline at end of file +FROM code.forgejo.org/oci/node:22 diff --git a/act/runner/testdata/actions/composite-fail-with-output/action.yml b/act/runner/testdata/actions/composite-fail-with-output/action.yml index 896022aa..bd33f3c0 100644 --- a/act/runner/testdata/actions/composite-fail-with-output/action.yml +++ b/act/runner/testdata/actions/composite-fail-with-output/action.yml @@ -1,13 +1,13 @@ -outputs: - customoutput: - value: my-customoutput-${{ steps.random-color-generator.outputs.SELECTED_COLOR }} -runs: - using: composite - steps: - - name: Set selected color - run: echo '::set-output name=SELECTED_COLOR::green' - id: random-color-generator - shell: bash - - name: fail - run: exit 1 - shell: bash \ No newline at end of file +outputs: + customoutput: + value: my-customoutput-${{ steps.random-color-generator.outputs.SELECTED_COLOR }} +runs: + using: composite + steps: + - name: Set selected color + run: echo '::set-output name=SELECTED_COLOR::green' + id: random-color-generator + shell: bash + - name: fail + run: exit 1 + shell: bash diff --git a/act/runner/testdata/actions/docker-local-noargs/Dockerfile b/act/runner/testdata/actions/docker-local-noargs/Dockerfile index b53bb336..5c288613 100644 --- a/act/runner/testdata/actions/docker-local-noargs/Dockerfile +++ b/act/runner/testdata/actions/docker-local-noargs/Dockerfile @@ -1,5 +1,5 @@ # Container image that runs your code -FROM node:12-buster-slim +FROM code.forgejo.org/oci/node:22 # Copies your code file from your action repository to the filesystem path `/` of the container COPY entrypoint.sh /entrypoint.sh diff --git a/act/runner/testdata/actions/docker-local/Dockerfile b/act/runner/testdata/actions/docker-local/Dockerfile index 47bc119d..5c288613 100644 --- a/act/runner/testdata/actions/docker-local/Dockerfile +++ b/act/runner/testdata/actions/docker-local/Dockerfile @@ -1,5 +1,5 @@ # Container image that runs your code -FROM node:16-buster-slim +FROM code.forgejo.org/oci/node:22 # Copies your code file from your action repository to the filesystem path `/` of the container COPY entrypoint.sh /entrypoint.sh diff --git a/act/runner/testdata/actions/docker-url/action.yml b/act/runner/testdata/actions/docker-url/action.yml index dd8aea39..8b6be1b3 100644 --- a/act/runner/testdata/actions/docker-url/action.yml +++ b/act/runner/testdata/actions/docker-url/action.yml @@ -8,7 +8,7 @@ inputs: default: World runs: using: docker - image: docker://node:16-buster-slim + image: docker://code.forgejo.org/oci/node:22 entrypoint: /bin/sh -c env: TEST: enabled diff --git a/act/runner/testdata/basic/push.yml b/act/runner/testdata/basic/push.yml index 02d82ef5..8cb1836f 100644 --- a/act/runner/testdata/basic/push.yml +++ b/act/runner/testdata/basic/push.yml @@ -11,7 +11,7 @@ jobs: - run: '[[ "$(pwd)" == "${GITHUB_WORKSPACE}" ]]' - run: echo ${{ env.TEST }} | grep value - run: env - - uses: docker://node:16-buster-slim + - uses: docker://code.forgejo.org/oci/node:22 with: somekey: ${{ env.TEST }} args: echo ${INPUT_SOMEKEY} | grep somevalue @@ -31,10 +31,10 @@ jobs: runs-on: ubuntu-latest needs: [build] steps: - - uses: docker://node:16-buster-slim + - uses: docker://code.forgejo.org/oci/node:22 with: args: env - - uses: docker://node:16-buster-slim + - uses: docker://code.forgejo.org/oci/node:22 with: entrypoint: /bin/echo args: ${{github.event_name}} diff --git a/act/runner/testdata/composite-fail-with-output/push.yml b/act/runner/testdata/composite-fail-with-output/push.yml index b7392c8d..0cb4b271 100644 --- a/act/runner/testdata/composite-fail-with-output/push.yml +++ b/act/runner/testdata/composite-fail-with-output/push.yml @@ -1,14 +1,14 @@ -name: composite-fail-with-output -on: push - -jobs: - test-for-output: - runs-on: ubuntu-latest - steps: - - uses: https://data.forgejo.org/actions/checkout@v2 - - uses: ./actions/composite-fail-with-output - id: composite-fail-with-output - continue-on-error: true - - run: | - echo ${{steps.composite-fail-with-output.outputs.customoutput}} - exit ${{steps.composite-fail-with-output.outputs.customoutput == 'my-customoutput-green' && '0' || '1'}} \ No newline at end of file +name: composite-fail-with-output +on: push + +jobs: + test-for-output: + runs-on: ubuntu-latest + steps: + - uses: https://data.forgejo.org/actions/checkout@v2 + - uses: ./actions/composite-fail-with-output + id: composite-fail-with-output + continue-on-error: true + - run: | + echo ${{steps.composite-fail-with-output.outputs.customoutput}} + exit ${{steps.composite-fail-with-output.outputs.customoutput == 'my-customoutput-green' && '0' || '1'}} diff --git a/act/runner/testdata/issue-104/main.yaml b/act/runner/testdata/issue-104/main.yaml index 78fda669..8b158373 100644 --- a/act/runner/testdata/issue-104/main.yaml +++ b/act/runner/testdata/issue-104/main.yaml @@ -10,6 +10,6 @@ jobs: steps: - name: hello - uses: https://github.com/actions/hello-world-docker-action@v1 + uses: https://code.forgejo.org/forgejo/hello-world-docker-action@v1 with: who-to-greet: "World" diff --git a/act/runner/testdata/job-container-non-root/push.yml b/act/runner/testdata/job-container-non-root/push.yml index 1fe0e3be..f5dc3ec3 100644 --- a/act/runner/testdata/job-container-non-root/push.yml +++ b/act/runner/testdata/job-container-non-root/push.yml @@ -5,6 +5,6 @@ jobs: test: runs-on: ubuntu-latest container: - image: catthehacker/ubuntu:runner-latest # image with user 'runner:runner' built on tag 'act-latest' + image: code.forgejo.org/forgejo/runner:8 steps: - run: echo PASS diff --git a/act/runner/testdata/local-action-via-composite-dockerfile/action/action.yml b/act/runner/testdata/local-action-via-composite-dockerfile/action/action.yml index 1101f253..0f92273b 100644 --- a/act/runner/testdata/local-action-via-composite-dockerfile/action/action.yml +++ b/act/runner/testdata/local-action-via-composite-dockerfile/action/action.yml @@ -32,7 +32,7 @@ runs: shell: bash - uses: ./localdockerimagetest_ # Also test a remote docker action here - - uses: https://github.com/actions/hello-world-docker-action@v1 + - uses: https://code.forgejo.org/forgejo/hello-world-docker-action@v1 with: who-to-greet: 'Mona the Octocat' # Test if GITHUB_ACTION_PATH is set correctly after all steps diff --git a/act/runner/testdata/remote-action-docker/push.yml b/act/runner/testdata/remote-action-docker/push.yml index dc6e11d3..752ef035 100644 --- a/act/runner/testdata/remote-action-docker/push.yml +++ b/act/runner/testdata/remote-action-docker/push.yml @@ -5,6 +5,6 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: https://github.com/actions/hello-world-docker-action@v1 + - uses: https://code.forgejo.org/forgejo/hello-world-docker-action@v1 with: who-to-greet: 'Mona the Octocat' diff --git a/act/runner/testdata/services-with-container/push.yml b/act/runner/testdata/services-with-container/push.yml index deafc607..cd670d2e 100644 --- a/act/runner/testdata/services-with-container/push.yml +++ b/act/runner/testdata/services-with-container/push.yml @@ -8,9 +8,7 @@ jobs: image: code.forgejo.org/oci/node:22-bookworm services: nginx: - image: "nginx:latest" - ports: - - "8080:80" + image: "code.forgejo.org/oci/apache-git:1" steps: - run: apt-get -qq update && apt-get -yqq install --no-install-recommends curl - run: curl -v http://nginx:80 diff --git a/act/runner/testdata/services/push.yaml b/act/runner/testdata/services/push.yaml index f6ca7bc4..03ac0855 100644 --- a/act/runner/testdata/services/push.yaml +++ b/act/runner/testdata/services/push.yaml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest services: postgres: - image: postgres:12 + image: code.forgejo.org/oci/bitnami/postgresql:16 env: POSTGRES_USER: runner POSTGRES_PASSWORD: mysecretdbpass diff --git a/act/runner/testdata/uses-docker-url/push.yml b/act/runner/testdata/uses-docker-url/push.yml index 336134c5..547f84f3 100644 --- a/act/runner/testdata/uses-docker-url/push.yml +++ b/act/runner/testdata/uses-docker-url/push.yml @@ -5,19 +5,18 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: docker://node:16-buster-slim + - uses: docker://code.forgejo.org/oci/node:22 with: somekey: somevalue args: echo ${INPUT_SOMEKEY} | grep somevalue - - uses: docker://node:16-buster-slim + - uses: docker://code.forgejo.org/oci/node:22 with: args: -v - - uses: docker://node:16-buster-slim + - uses: docker://code.forgejo.org/oci/node:22 with: entrypoint: /bin/sh args: -c -- uname -a - - uses: docker://node:16-buster-slim + - uses: docker://code.forgejo.org/oci/node:22 with: entrypoint: /bin/sh args: -c 'uname -a' - diff --git a/act/runner/testdata/uses-github-full-sha/main.yml b/act/runner/testdata/uses-github-full-sha/main.yml index 6ec7f4e4..5eb25398 100644 --- a/act/runner/testdata/uses-github-full-sha/main.yml +++ b/act/runner/testdata/uses-github-full-sha/main.yml @@ -4,4 +4,4 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: https://github.com/actions/hello-world-docker-action@b136eb8894c5cb1dd5807da824be97ccdf9b5423 + - uses: https://code.forgejo.org/forgejo/hello-world-docker-action@4b60c28ca1d0868e9c6efc0d8274b32cba37717a diff --git a/act/runner/testdata/uses-github-short-sha/main.yml b/act/runner/testdata/uses-github-short-sha/main.yml index c30b6bf0..c7eca562 100644 --- a/act/runner/testdata/uses-github-short-sha/main.yml +++ b/act/runner/testdata/uses-github-short-sha/main.yml @@ -4,4 +4,4 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: https://github.com/actions/hello-world-docker-action@b136eb8 + - uses: https://code.forgejo.org/forgejo/hello-world-docker-action@4b60c28