diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 94b042d5..4d06f658 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -16,6 +16,7 @@ builds: - amd64 - arm - arm64 + - loong64 - s390x - riscv64 goarm: diff --git a/Dockerfile b/Dockerfile index 209ce7d6..40e2d660 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN make clean && make build ### DIND VARIANT # # -FROM docker:dind AS dind +FROM docker:28-dind AS dind RUN apk add --no-cache s6 bash git tzdata @@ -32,7 +32,7 @@ ENTRYPOINT ["s6-svscan","/etc/s6"] ### DIND-ROOTLESS VARIANT # # -FROM docker:dind-rootless AS dind-rootless +FROM docker:28-dind-rootless AS dind-rootless USER root RUN apk add --no-cache s6 bash git tzdata @@ -59,8 +59,6 @@ RUN apk add --no-cache tini bash git tzdata COPY --from=builder /opt/src/act_runner/act_runner /usr/local/bin/act_runner COPY scripts/run.sh /usr/local/bin/run.sh -VOLUME /var/run/docker.sock - VOLUME /data ENTRYPOINT ["/sbin/tini","--","run.sh"] diff --git a/go.mod b/go.mod index bb78aae0..0233784e 100644 --- a/go.mod +++ b/go.mod @@ -98,6 +98,6 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect ) -replace github.com/nektos/act => gitea.com/gitea/act v0.261.7 +replace github.com/nektos/act => gitea.com/gitea/act v0.261.7-0.20251202193638-5417d3ac6742 replace github.com/go-git/go-git/v5 => github.com/go-git/go-git/v5 v5.16.2 diff --git a/go.sum b/go.sum index b7e73164..c58e48db 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,8 @@ connectrpc.com/connect v1.16.2 h1:ybd6y+ls7GOlb7Bh5C8+ghA6SvCBajHwxssO2CGFjqE= connectrpc.com/connect v1.16.2/go.mod h1:n2kgwskMHXC+lVqb18wngEpF95ldBHXjZYJussz5FRc= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= -gitea.com/gitea/act v0.261.7 h1:0tX0EdWo5uZUgsN/iJGyEAtagqYURrbOuWxyx+LV1Wk= -gitea.com/gitea/act v0.261.7/go.mod h1:Pg5C9kQY1CEA3QjthjhlrqOC/QOT5NyWNjOjRHw23Ok= +gitea.com/gitea/act v0.261.7-0.20251202193638-5417d3ac6742 h1:ulcquQluJbmNASkh6ina70LvcHEa9eWYfQ+DeAZ0VEE= +gitea.com/gitea/act v0.261.7-0.20251202193638-5417d3ac6742/go.mod h1:Pg5C9kQY1CEA3QjthjhlrqOC/QOT5NyWNjOjRHw23Ok= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= diff --git a/internal/pkg/config/config.example.yaml b/internal/pkg/config/config.example.yaml index 8fe4448d..4d21ef58 100644 --- a/internal/pkg/config/config.example.yaml +++ b/internal/pkg/config/config.example.yaml @@ -21,7 +21,7 @@ runner: env_file: .env # The timeout for a job to be finished. # Please note that the Gitea instance also has a timeout (3h by default) for the job. - # So the job could be stopped by the Gitea instance if it's timeout is shorter than this. + # So the job could be stopped by the Gitea instance if its timeout is shorter than this. timeout: 3h # The timeout for the runner to wait for running jobs to finish when shutting down. # Any running jobs that haven't finished after this timeout will be cancelled. @@ -39,13 +39,13 @@ runner: github_mirror: '' # The labels of a runner are used to determine which jobs the runner can run, and how to run them. # Like: "macos-arm64:host" or "ubuntu-latest:docker://docker.gitea.com/runner-images:ubuntu-latest" - # Find more images provided by Gitea at https://gitea.com/docker.gitea.com/runner-images . + # Find more images provided by Gitea at https://gitea.com/gitea/runner-images . # If it's empty when registering, it will ask for inputting labels. # If it's empty when execute `daemon`, will use labels in `.runner` file. labels: - "ubuntu-latest:docker://docker.gitea.com/runner-images:ubuntu-latest" + - "ubuntu-24.04:docker://docker.gitea.com/runner-images:ubuntu-24.04" - "ubuntu-22.04:docker://docker.gitea.com/runner-images:ubuntu-22.04" - - "ubuntu-20.04:docker://docker.gitea.com/runner-images:ubuntu-20.04" cache: # Enable cache server to use actions/cache. @@ -72,7 +72,7 @@ container: network: "" # Whether to use privileged mode or not when launching task containers (privileged mode is required for Docker-in-Docker). privileged: false - # And other options to be used when the container is started (eg, --add-host=my.gitea.url:host-gateway). + # Any other options to be used when the container is started (e.g., --add-host=my.gitea.url:host-gateway). options: # The parent directory of a job's working directory. # NOTE: There is no need to add the first '/' of the path as act_runner will add it automatically. @@ -90,7 +90,7 @@ container: # valid_volumes: # - '**' valid_volumes: [] - # overrides the docker client host with the specified one. + # Overrides the docker client host with the specified one. # If it's empty, act_runner will find an available docker host automatically. # If it's "-", act_runner will find an available docker host automatically, but the docker host won't be mounted to the job containers and service containers. # If it's not empty or "-", the specified docker host will be used. An error will be returned if it doesn't work.