From cca6cc9bea1463b272c0fa87b834c26c157050eb Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Thu, 9 Nov 2023 12:23:50 +0100 Subject: [PATCH 1/2] [FORGEJO] upgrade to act v1.14.0 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 79b38fe..81281f2 100644 --- a/go.mod +++ b/go.mod @@ -93,4 +93,4 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect ) -replace github.com/nektos/act => code.forgejo.org/forgejo/act v1.13.0 +replace github.com/nektos/act => code.forgejo.org/forgejo/act v1.14.0 diff --git a/go.sum b/go.sum index 51d96ae..38050e1 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -code.forgejo.org/forgejo/act v1.13.0 h1:qaAzfnussiAZXRXapuKxS9qm6OYlMN/JVT0sW5jUOn0= -code.forgejo.org/forgejo/act v1.13.0/go.mod h1:YthlRq0FUQIzgfJ3ZWvCvVq3I3VsC9s2NYQ9b2Uxccs= +code.forgejo.org/forgejo/act v1.14.0 h1:V8YsScGvM2YtDtCFZVIKZZHyjA1t26mtXXOIYX9cSck= +code.forgejo.org/forgejo/act v1.14.0/go.mod h1:YthlRq0FUQIzgfJ3ZWvCvVq3I3VsC9s2NYQ9b2Uxccs= code.gitea.io/actions-proto-go v0.3.1 h1:PMyiQtBKb8dNnpEO2R5rcZdXSis+UQZVo/SciMtR1aU= code.gitea.io/actions-proto-go v0.3.1/go.mod h1:00ys5QDo1iHN1tHNvvddAcy2W/g+425hQya1cCSvq9A= code.gitea.io/gitea-vet v0.2.3-0.20230113022436-2b1561217fa5 h1:daBEK2GQeqGikJESctP5Cu1i33z5ztAD4kyQWiw185M= From e934c2a70d20c439f663214eb49a9cd03c039b55 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Thu, 9 Nov 2023 13:06:46 +0100 Subject: [PATCH 2/2] [FORGEJO] update the 3.1 release notes --- README.md | 3 ++- RELEASE-NOTES.md | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ed348c..0041f8b 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,8 @@ cd runner ; rm -f forgejo-runner ; make forgejo-runner A Forgejo instance is launched with: ```shell -cd setup-forgejo ; ./forgejo.sh setup +cd setup-forgejo +./forgejo.sh setup firefox http://$(cat forgejo-ip):3000 ``` diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index c991287..3560540 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,5 +1,17 @@ # Release Notes +## 3.1.0 + +The `self-hosted` label that was hardwired to be a LXC container +running `debian:bullseye` was reworked and documented ([user guide](https://forgejo.org/docs/next/user/actions/#jobsjob_idruns-on) and [admin guide](https://forgejo.org/docs/next/admin/actions/#labels-and-runs-on)). + +There now are two different schemes: `lxc://` for LXC containers and +`host://` for running directly on the host. + +* Support the `host://` scheme for running directly on the host. +* Support the `lxc://` scheme in labels +* Update [code.forgejo.org/forgejo/act v1.14.0](https://code.forgejo.org/forgejo/act/pulls/19) to implement both self-hosted and LXC schemes + ## 3.0.3 * Update [code.forgejo.org/forgejo/act v1.13.0](https://code.forgejo.org/forgejo/runner/pulls/106) to keep up with github.com/nektos/act