merge upstream

chore: resolve all
Correction
2025-08-21 20:08:19 +00:00 · 2025-08-21 22:01:17 +02:00 · 2025-08-21 21:53:34 +02:00 · 2025-08-21 17:47:26 +00:00
3 changed files with 8 additions and 8 deletions
--- a/10
+++ b/10
@ -14,12 +14,12 @@ WORKDIR /opt/src/act_runner

 RUN make clean && make build

-### DIND STAGE
+### DIND VARIANT
 #
 #
 FROM docker:dind AS dind

-RUN apk add --no-cache s6 bash git
+RUN apk add --no-cache s6 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
@ -29,13 +29,13 @@ VOLUME /data

 ENTRYPOINT ["s6-svscan","/etc/s6"]

-### DIND-ROOTLESS STAGE
+### DIND-ROOTLESS VARIANT
 #
 #
 FROM docker:dind-rootless AS dind-rootless

 USER root
-RUN apk add --no-cache s6 bash git
+RUN apk add --no-cache s6 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
@ -50,7 +50,7 @@ ENV DOCKER_HOST=unix:///run/user/1000/docker.sock
 USER rootless
 ENTRYPOINT ["s6-svscan","/etc/s6"]

-### FINAL STAGE
+### BASIC VARIANT
 #
 #
 FROM alpine AS basic
--- 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.4
+replace github.com/nektos/act => gitea.com/gitea/act v0.261.7

 replace github.com/go-git/go-git/v5 => github.com/go-git/go-git/v5 v5.16.2
--- 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.4 h1:Tf9eLlvsYFtKcpuxlMvf9yT3g4Hshb2Beqw6C1STuH8=
-gitea.com/gitea/act v0.261.4/go.mod h1:Pg5C9kQY1CEA3QjthjhlrqOC/QOT5NyWNjOjRHw23Ok=
+gitea.com/gitea/act v0.261.7 h1:0tX0EdWo5uZUgsN/iJGyEAtagqYURrbOuWxyx+LV1Wk=
+gitea.com/gitea/act v0.261.7/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=
Author	SHA1	Message	Date
DaanSelen	8650f84f0b	merge upstream	2025-08-21 20:08:19 +00:00
Daan Selen	5fcc75825a	chore: resolve all	2025-08-21 22:01:17 +02:00
Daan Selen	81edefe60b	Correction	2025-08-21 21:53:34 +02:00
Christopher Homberger	6a7e18b124	Allow node24 actions (#737 ) * `node` Tool is used regardless of this change * upgrade images with `node` = `node24` if required * actions/checkout@v5 now passing validation Fixes #729 Reviewed-on: https://gitea.com/gitea/act_runner/pulls/737 Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: Christopher Homberger <christopher.homberger@web.de> Co-committed-by: Christopher Homberger <christopher.homberger@web.de>	2025-08-21 17:47:26 +00:00