Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package forgejo-runner for openSUSE:Factory checked in at 2024-12-18 20:09:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/forgejo-runner (Old) and /work/SRC/openSUSE:Factory/.forgejo-runner.new.29675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "forgejo-runner" Wed Dec 18 20:09:37 2024 rev:9 rq:1231767 version:5.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/forgejo-runner/forgejo-runner.changes 2024-11-27 22:16:10.404602664 +0100 +++ /work/SRC/openSUSE:Factory/.forgejo-runner.new.29675/forgejo-runner.changes 2024-12-18 20:09:53.616655341 +0100 @@ -1,0 +2,6 @@ +Wed Dec 18 00:03:40 UTC 2024 - [email protected] + +- Update to version 5.0.4: + * feat: use FORGEJO_TOKEN as runtime token + +------------------------------------------------------------------- Old: ---- forgejo-runner-5.0.3.obscpio New: ---- forgejo-runner-5.0.4.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ forgejo-runner.spec ++++++ --- /var/tmp/diff_new_pack.LAtPOZ/_old 2024-12-18 20:09:54.524693187 +0100 +++ /var/tmp/diff_new_pack.LAtPOZ/_new 2024-12-18 20:09:54.524693187 +0100 @@ -17,7 +17,7 @@ Name: forgejo-runner -Version: 5.0.3 +Version: 5.0.4 Release: 0 Summary: Daemon that connects to a Forgejo instance and runs CI jobs License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.LAtPOZ/_old 2024-12-18 20:09:54.560694688 +0100 +++ /var/tmp/diff_new_pack.LAtPOZ/_new 2024-12-18 20:09:54.560694688 +0100 @@ -2,7 +2,7 @@ <service name="obs_scm" mode="manual"> <param name="url">https://code.forgejo.org/forgejo/runner</param> <param name="scm">git</param> - <param name="revision">refs/tags/v5.0.3</param> + <param name="revision">refs/tags/v5.0.4</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.LAtPOZ/_old 2024-12-18 20:09:54.588695855 +0100 +++ /var/tmp/diff_new_pack.LAtPOZ/_new 2024-12-18 20:09:54.588695855 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://code.forgejo.org/forgejo/runner</param> - <param name="changesrevision">f8b0ccf1a3a068153e5fc453e44f993ba9243337</param></service></servicedata> + <param name="changesrevision">227c2b2dc1b43547309e679d49c6c435b55afbf3</param></service></servicedata> (No newline at EOF) ++++++ forgejo-runner-5.0.3.obscpio -> forgejo-runner-5.0.4.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/forgejo-runner-5.0.3/.forgejo/workflows/build-release-integration.yml new/forgejo-runner-5.0.4/.forgejo/workflows/build-release-integration.yml --- old/forgejo-runner-5.0.3/.forgejo/workflows/build-release-integration.yml 2024-11-27 10:39:17.000000000 +0100 +++ new/forgejo-runner-5.0.4/.forgejo/workflows/build-release-integration.yml 2024-12-17 07:37:02.000000000 +0100 @@ -18,13 +18,13 @@ jobs: release-simulation: - runs-on: self-hosted + runs-on: lxc-bookworm if: github.repository_owner != 'forgejo-integration' && github.repository_owner != 'forgejo-release' steps: - uses: actions/checkout@v4 - id: forgejo - uses: https://code.forgejo.org/actions/setup-forgejo@v1 + uses: https://code.forgejo.org/actions/[email protected] with: user: root password: admin1234 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/forgejo-runner-5.0.3/.forgejo/workflows/build-release.yml new/forgejo-runner-5.0.4/.forgejo/workflows/build-release.yml --- old/forgejo-runner-5.0.3/.forgejo/workflows/build-release.yml 2024-11-27 10:39:17.000000000 +0100 +++ new/forgejo-runner-5.0.4/.forgejo/workflows/build-release.yml 2024-12-17 07:37:02.000000000 +0100 @@ -17,7 +17,7 @@ jobs: release: - runs-on: self-hosted + runs-on: lxc-bookworm # root is used for testing, allow it if: secrets.ROLE == 'forgejo-integration' || github.repository_owner == 'root' steps: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/forgejo-runner-5.0.3/.forgejo/workflows/example-docker-compose.yml new/forgejo-runner-5.0.4/.forgejo/workflows/example-docker-compose.yml --- old/forgejo-runner-5.0.3/.forgejo/workflows/example-docker-compose.yml 2024-11-27 10:39:17.000000000 +0100 +++ new/forgejo-runner-5.0.4/.forgejo/workflows/example-docker-compose.yml 2024-12-17 07:37:02.000000000 +0100 @@ -8,7 +8,7 @@ jobs: example-docker-compose: if: github.repository_owner != 'forgejo-integration' && github.repository_owner != 'forgejo-experimental' && github.repository_owner != 'forgejo-release' - runs-on: self-hosted + runs-on: lxc-bookworm steps: - uses: actions/checkout@v4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/forgejo-runner-5.0.3/.forgejo/workflows/publish-release.yml new/forgejo-runner-5.0.4/.forgejo/workflows/publish-release.yml --- old/forgejo-runner-5.0.3/.forgejo/workflows/publish-release.yml 2024-11-27 10:39:17.000000000 +0100 +++ new/forgejo-runner-5.0.4/.forgejo/workflows/publish-release.yml 2024-12-17 07:37:02.000000000 +0100 @@ -22,19 +22,20 @@ jobs: publish: - runs-on: self-hosted + runs-on: lxc-bookworm if: secrets.DOER != '' && secrets.FORGEJO != '' && secrets.TO_OWNER != '' && secrets.FROM_OWNER != '' && secrets.TOKEN != '' steps: - uses: actions/checkout@v4 - name: copy & sign - uses: https://code.forgejo.org/forgejo/forgejo-build-publish/publish@v5 + uses: https://code.forgejo.org/forgejo/forgejo-build-publish/[email protected] with: from-forgejo: ${{ secrets.FORGEJO }} to-forgejo: ${{ secrets.FORGEJO }} from-owner: ${{ secrets.FROM_OWNER }} to-owner: ${{ secrets.TO_OWNER }} repo: "runner" + release-notes: "See https://code.forgejo.org/forgejo/runner/src/branch/main/RELEASE-NOTES.md#{ANCHOR}"; ref-name: ${{ github.ref_name }} sha: ${{ github.sha }} container-suffixes: " " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/forgejo-runner-5.0.3/.forgejo/workflows/test.yml new/forgejo-runner-5.0.4/.forgejo/workflows/test.yml --- old/forgejo-runner-5.0.3/.forgejo/workflows/test.yml 2024-11-27 10:39:17.000000000 +0100 +++ new/forgejo-runner-5.0.4/.forgejo/workflows/test.yml 2024-12-17 07:37:02.000000000 +0100 @@ -20,7 +20,7 @@ if: github.repository_owner != 'forgejo-integration' && github.repository_owner != 'forgejo-experimental' && github.repository_owner != 'forgejo-release' runs-on: docker container: - image: 'code.forgejo.org/oci/node:20-bookworm' + image: 'code.forgejo.org/oci/ci:1' services: forgejo: @@ -44,6 +44,16 @@ with: go-version-file: go.mod + - name: validate go version + run: | + set -ex + toolchain=$(grep -oP '(?<=toolchain ).+' go.mod) + version=$(go version | cut -d' ' -f3) + if [ "$toolchain" != "$version" ]; then + echo "go version mismatch: $toolchain <> $version" + exit 1 + fi + - run: make vet - run: make build @@ -55,8 +65,6 @@ - name: check the forgejo server is responding run: | - apt-get update -qq - apt-get install -y -qq jq curl retry sleep 10 # matches the sleep 10 in the bootstrap of the Forgejo instance # in case of a slow machine, give it time to bootstrap retry --delay=10 --times=6 bash -c 'test $FORGEJO_ADMIN_USER = $(curl -sS http://$FORGEJO_ADMIN_USER:$FORGEJO_ADMIN_PASSWORD@$FORGEJO_HOST_PORT/api/v1/user | jq --raw-output .login)' @@ -67,7 +75,7 @@ needs: [build-and-tests] name: runner exec tests if: github.repository_owner != 'forgejo-integration' && github.repository_owner != 'forgejo-experimental' && github.repository_owner != 'forgejo-release' - runs-on: self-hosted + runs-on: lxc-bookworm steps: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/forgejo-runner-5.0.3/RELEASE-NOTES.md new/forgejo-runner-5.0.4/RELEASE-NOTES.md --- old/forgejo-runner-5.0.3/RELEASE-NOTES.md 2024-11-27 10:39:17.000000000 +0100 +++ new/forgejo-runner-5.0.4/RELEASE-NOTES.md 2024-12-17 07:37:02.000000000 +0100 @@ -1,5 +1,9 @@ # Release Notes +## 5.0.4 + +* Define FORGEJO_TOKEN as an alias to GITHUB_TOKEN + ## 5.0.3 * [Fixes a regression](https://code.forgejo.org/forgejo/runner/pulls/354) that was introduced in version 5.0.0 by which it was no longer possible to mount the docker socket in each container by specifying `[container].docker_host = ""`. This is now implemented when `[container].docker_host = "automount"` is specified. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/forgejo-runner-5.0.3/go.mod new/forgejo-runner-5.0.4/go.mod --- old/forgejo-runner-5.0.3/go.mod 2024-11-27 10:39:17.000000000 +0100 +++ new/forgejo-runner-5.0.4/go.mod 2024-12-17 07:37:02.000000000 +0100 @@ -1,13 +1,15 @@ module gitea.com/gitea/act_runner -go 1.23.3 +go 1.23 + +toolchain go1.23.4 require ( code.gitea.io/actions-proto-go v0.4.0 code.gitea.io/gitea-vet v0.2.3 connectrpc.com/connect v1.17.0 github.com/avast/retry-go/v4 v4.6.0 - github.com/docker/docker v25.0.6+incompatible + github.com/docker/docker v25.0.7+incompatible github.com/google/uuid v1.6.0 github.com/joho/godotenv v1.5.1 github.com/mattn/go-isatty v0.0.20 @@ -17,7 +19,7 @@ github.com/stretchr/testify v1.10.0 golang.org/x/term v0.26.0 golang.org/x/time v0.8.0 - google.golang.org/protobuf v1.35.2 + google.golang.org/protobuf v1.36.0 gopkg.in/yaml.v3 v3.0.1 gotest.tools/v3 v3.5.1 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/forgejo-runner-5.0.3/go.sum new/forgejo-runner-5.0.4/go.sum --- old/forgejo-runner-5.0.3/go.sum 2024-11-27 10:39:17.000000000 +0100 +++ new/forgejo-runner-5.0.4/go.sum 2024-12-17 07:37:02.000000000 +0100 @@ -51,8 +51,8 @@ github.com/docker/cli v25.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v25.0.6+incompatible h1:5cPwbwriIcsua2REJe8HqQV+6WlWc1byg2QSXzBxBGg= -github.com/docker/docker v25.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v25.0.7+incompatible h1:PQhcun5/OF7p0mZlDu3ud9APyyJi01R6/7hrBymWhhQ= +github.com/docker/docker v25.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8= github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= @@ -314,8 +314,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc= google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= -google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= -google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ= +google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/forgejo-runner-5.0.3/internal/app/cmd/exec.go new/forgejo-runner-5.0.4/internal/app/cmd/exec.go --- old/forgejo-runner-5.0.3/internal/app/cmd/exec.go 2024-11-27 10:39:17.000000000 +0100 +++ new/forgejo-runner-5.0.4/internal/app/cmd/exec.go 2024-12-17 07:37:02.000000000 +0100 @@ -418,7 +418,9 @@ config.Env["ACT_EXEC"] = "true" - if t := config.Secrets["GITEA_TOKEN"]; t != "" { + if t := config.Secrets["FORGEJO_TOKEN"]; t != "" { + config.Token = t + } else if t := config.Secrets["GITEA_TOKEN"]; t != "" { config.Token = t } else if t := config.Secrets["GITHUB_TOKEN"]; t != "" { config.Token = t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/forgejo-runner-5.0.3/internal/app/run/runner.go new/forgejo-runner-5.0.4/internal/app/run/runner.go --- old/forgejo-runner-5.0.3/internal/app/run/runner.go 2024-11-27 10:39:17.000000000 +0100 +++ new/forgejo-runner-5.0.4/internal/app/run/runner.go 2024-12-17 07:37:02.000000000 +0100 @@ -168,7 +168,9 @@ RepositoryOwner: taskContext["repository_owner"].GetStringValue(), RetentionDays: taskContext["retention_days"].GetStringValue(), } - if t := task.Secrets["GITEA_TOKEN"]; t != "" { + if t := task.Secrets["FORGEJO_TOKEN"]; t != "" { + preset.Token = t + } else if t := task.Secrets["GITEA_TOKEN"]; t != "" { preset.Token = t } else if t := task.Secrets["GITHUB_TOKEN"]; t != "" { preset.Token = t @@ -217,7 +219,7 @@ NoSkipCheckout: true, PresetGitHubContext: preset, EventJSON: string(eventJSON), - ContainerNamePrefix: fmt.Sprintf("GITEA-ACTIONS-TASK-%d", task.Id), + ContainerNamePrefix: fmt.Sprintf("FORGEJO-ACTIONS-TASK-%d", task.Id), ContainerMaxLifetime: maxLifetime, ContainerNetworkMode: container.NetworkMode(r.cfg.Container.Network), ContainerNetworkEnableIPv6: r.cfg.Container.EnableIPv6, ++++++ forgejo-runner.obsinfo ++++++ --- /var/tmp/diff_new_pack.LAtPOZ/_old 2024-12-18 20:09:54.712701023 +0100 +++ /var/tmp/diff_new_pack.LAtPOZ/_new 2024-12-18 20:09:54.712701023 +0100 @@ -1,5 +1,5 @@ name: forgejo-runner -version: 5.0.3 -mtime: 1732700357 -commit: f8b0ccf1a3a068153e5fc453e44f993ba9243337 +version: 5.0.4 +mtime: 1734417422 +commit: 227c2b2dc1b43547309e679d49c6c435b55afbf3 ++++++ vendor.tar.gz ++++++ ++++ 4292 lines of diff (skipped)
