Merge pull request 'Update module connectrpc.com/connect to v1.17.0' (#280 ) from renovate/connectrpc.com-connect-1.x into main

Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/280 Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Update module connectrpc.com/connect to v1.17.0
2024-09-21 06:25:28 +00:00 · 2024-09-21 00:01:34 +00:00 · 2024-09-18 13:40:32 +00:00 · 2024-09-18 10:36:39 +00:00 · 2024-09-16 03:38:02 +00:00 · 2024-09-15 22:23:40 +02:00
8 changed files with 73 additions and 22 deletions
--- a/.forgejo/workflows/build-release.yml
+++ b/.forgejo/workflows/build-release.yml
@ -5,8 +5,8 @@
 #  Build the runner binaries and OCI images
 #
 #  ROLE: forgejo-integration
-#  DOER: release-team
-#  TOKEN: <generated from codeberg.org/release-team>
+#  DOER: forgejo-ci
+#  TOKEN: <generated from https://code.forgejo.org/forgejo-ci>
 #
 name: Build release

--- a/.forgejo/workflows/publish-release.yml
+++ b/.forgejo/workflows/publish-release.yml
@ -13,7 +13,7 @@
 #  GPG_PRIVATE_KEY: <XYZ>
 #  GPG_PASSPHRASE: <ABC>
 #
-name: pubish
+name: publish

 on:
  push:
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@ -1,5 +1,9 @@
 # Release Notes

+## 3.5.2
+
+* Fix [crash in some cases when the YAML structure is not as expected](https://code.forgejo.org/forgejo/runner/issues/267).
+
 ## 3.5.1

 * Fix [CVE-2024-24557](https://nvd.nist.gov/vuln/detail/CVE-2024-24557)
--- a/contrib/forgejo-runner.service
+++ b/contrib/forgejo-runner.service
@ -0,0 +1,18 @@
+[Unit]
+Description=Forgejo Runner
+Documentation=https://forgejo.org/docs/latest/admin/actions/
+After=docker.service
+
+[Service]
+ExecStart=forgejo-runner daemon
+ExecReload=/bin/kill -s HUP $MAINPID
+
+# This user and working directory must already exist
+User=runner 
+WorkingDirectory=/home/runner
+Restart=on-failure
+TimeoutSec=0
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target
--- a/go.mod
+++ b/go.mod
@ -2,12 +2,12 @@ module gitea.com/gitea/act_runner

 go 1.21.13

-toolchain go1.23.0
+toolchain go1.23.1

 require (
 	code.gitea.io/actions-proto-go v0.4.0
 	code.gitea.io/gitea-vet v0.2.3
-	connectrpc.com/connect v1.16.2
+	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/google/uuid v1.6.0
@ -17,7 +17,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.8.1
 	github.com/stretchr/testify v1.9.0
-	golang.org/x/term v0.23.0
+	golang.org/x/term v0.24.0
 	golang.org/x/time v0.6.0
 	google.golang.org/protobuf v1.34.2
 	gopkg.in/yaml.v3 v3.0.1
@ -96,10 +96,10 @@ require (
 	golang.org/x/mod v0.13.0 // indirect
 	golang.org/x/net v0.23.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/sys v0.23.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
 	golang.org/x/tools v0.14.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

-replace github.com/nektos/act => code.forgejo.org/forgejo/act v1.21.2
+replace github.com/nektos/act => code.forgejo.org/forgejo/act v1.21.3
--- a/go.sum
+++ b/go.sum
@ -1,11 +1,11 @@
-code.forgejo.org/forgejo/act v1.21.2 h1:LERMtDNZDFXOYYYSU7Yduyyz7sN0t/Xnc1wFlupweiE=
-code.forgejo.org/forgejo/act v1.21.2/go.mod h1:+PcvJ9iv+NTFeJSh79ra9Jbk9l0vvyA9D9me5/dbxYM=
+code.forgejo.org/forgejo/act v1.21.3 h1:EeJbrz0aar2QhIcBlOW5gjK1rjrQxcAvQSPpG/R1h5w=
+code.forgejo.org/forgejo/act v1.21.3/go.mod h1:+PcvJ9iv+NTFeJSh79ra9Jbk9l0vvyA9D9me5/dbxYM=
 code.gitea.io/actions-proto-go v0.4.0 h1:OsPBPhodXuQnsspG1sQ4eRE1PeoZyofd7+i73zCwnsU=
 code.gitea.io/actions-proto-go v0.4.0/go.mod h1:mn7Wkqz6JbnTOHQpot3yDeHx+O5C9EGhMEE+htvHBas=
 code.gitea.io/gitea-vet v0.2.3 h1:gdFmm6WOTM65rE8FUBTRzeQZYzXePKSSB1+r574hWwI=
 code.gitea.io/gitea-vet v0.2.3/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFjGGfE=
-connectrpc.com/connect v1.16.2 h1:ybd6y+ls7GOlb7Bh5C8+ghA6SvCBajHwxssO2CGFjqE=
-connectrpc.com/connect v1.16.2/go.mod h1:n2kgwskMHXC+lVqb18wngEpF95ldBHXjZYJussz5FRc=
+connectrpc.com/connect v1.17.0 h1:W0ZqMhtVzn9Zhn2yATuUokDLO5N+gIuBWMOnsQrfmZk=
+connectrpc.com/connect v1.17.0/go.mod h1:0292hj1rnx8oFrStN7cB4jjVBeqs+Yx5yDIC2prWDO8=
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
@ -274,15 +274,15 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
-golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
-golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
+golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
+golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
--- a/internal/app/run/workflow_test.go
+++ b/internal/app/run/workflow_test.go
@ -19,7 +19,7 @@ func Test_generateWorkflow(t *testing.T) {
 	tests := []struct {
 		name    string
 		args    args
-		assert  func(t *testing.T, wf *model.Workflow)
+		assert  func(t *testing.T, wf *model.Workflow, err error)
 		want1   string
 		wantErr bool
 	}{
@ -56,19 +56,41 @@ jobs:
 					},
 				},
 			},
-			assert: func(t *testing.T, wf *model.Workflow) {
+			assert: func(t *testing.T, wf *model.Workflow, err error) {
 				assert.DeepEqual(t, wf.GetJob("job9").Needs(), []string{"job1", "job2"})
 			},
 			want1:   "job9",
 			wantErr: false,
 		},
+		{
+			name: "valid YAML syntax in top level env but wrong value type",
+			args: args{
+				task: &runnerv1.Task{
+					WorkflowPayload: []byte(`
+on: push
+
+env:
+  value: {{ }}
+`),
+				},
+			},
+			assert: func(t *testing.T, wf *model.Workflow, err error) {
+				require.Nil(t, wf)
+				assert.ErrorContains(t, err, "cannot unmarshal")
+			},
+			wantErr: true,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got, got1, err := generateWorkflow(tt.args.task)
-			require.NoError(t, err)
-			tt.assert(t, got)
-			assert.Equal(t, got1, tt.want1)
+			if tt.wantErr {
+				require.Error(t, err)
+			} else {
+				require.NoError(t, err)
+				assert.Equal(t, got1, tt.want1)
+			}
+			tt.assert(t, got, err)
 		})
 	}
 }
--- a/renovate.json
+++ b/renovate.json
@ -1,4 +1,11 @@
 {
  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["local>forgejo/renovate-config"]
+  "extends": ["local>forgejo/renovate-config"],
+  "packageRules": [
+    {
+      "description": "Disable nektos/act, it's replaced",
+      "matchDepNames": ["github.com/nektos/act"],
+      "enabled": false
+    }
+  ]
 }
Author	SHA1	Message	Date
earl-warren	d3b8b3bb16	Merge pull request 'Update module connectrpc.com/connect to v1.17.0' (#280 ) from renovate/connectrpc.com-connect-1.x into main Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/280 Reviewed-by: Michael Kriese <michael.kriese@gmx.de>	2024-09-21 06:25:28 +00:00
Renovate Bot	a616fd2a37	Update module connectrpc.com/connect to v1.17.0	2024-09-21 00:01:34 +00:00
Kwonunn	6c067bfd76	Fix comments in systemd unit service file (#274 ) Apparently, even though my IDE grayed them out, you cannot start a comment mid-line in a systemd configuration file. I really should have tested this :3 Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/274 Reviewed-by: Michael Kriese <michael.kriese@gmx.de> Co-authored-by: Kwonunn <kwonunnx@gmail.com> Co-committed-by: Kwonunn <kwonunnx@gmail.com>	2024-09-18 13:40:32 +00:00
Kwonunn	89e4df134b	Add example systemd service file (#273 ) Adds an example systemd service file. This is meant for the new and hopefully improved runner installation docs i'm writing over at [forgejo/docs#869](https://codeberg.org/forgejo/docs/pulls/860). Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/273 Reviewed-by: Michael Kriese <michael.kriese@gmx.de> Co-authored-by: Kwonunn <kwonunnx@gmail.com> Co-committed-by: Kwonunn <kwonunnx@gmail.com>	2024-09-18 10:36:39 +00:00
earl-warren	a05194faa1	Merge pull request 'Update module code.forgejo.org/forgejo/act to v1.21.3' (#271 ) from earl-warren/runner:wip-act-update into main Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/271	2024-09-16 03:38:02 +00:00
Earl Warren	3b185b53cd	Update module code.forgejo.org/forgejo/act to v1.21.3	2024-09-15 22:23:40 +02:00
earl-warren	0b93541ffc	Merge pull request 'chore: update the 3.5.2 release notes' (#270 ) from earl-warren/runner:wip-release-notes into main Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/270 Reviewed-by: Michael Kriese <michael.kriese@gmx.de>	2024-09-15 14:41:40 +00:00
earl-warren	db9f23de54	Merge pull request 'chore: add test for unexpected YAML type in top level env' (#269 ) from earl-warren/runner:wip-env-type into main Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/269 Reviewed-by: Michael Kriese <michael.kriese@gmx.de>	2024-09-15 14:28:44 +00:00
Earl Warren	6d84004259	chore: update the 3.5.2 release notes	2024-09-15 16:26:12 +02:00
Earl Warren	b1d9d52b6f	chore: add test for unexpected YAML type in top level env	2024-09-15 16:05:01 +02:00
earl-warren	4b7b5d564d	Merge pull request 'Update dependency go to v1.23.1' (#266 ) from renovate/patch-golang-packages into main Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/266 Reviewed-by: earl-warren <earl-warren@noreply.code.forgejo.org>	2024-09-06 05:20:18 +00:00
Renovate Bot	98b5a0cbe1	Update dependency go to v1.23.1	2024-09-05 16:01:23 +00:00
earl-warren	db2c3b32d4	Merge pull request 'Update module golang.org/x/term to v0.24.0' (#265 ) from renovate/golang.org-x-term-0.x into main Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/265 Reviewed-by: earl-warren <earl-warren@noreply.code.forgejo.org> Reviewed-by: Michael Kriese <michael.kriese@gmx.de>	2024-09-05 14:45:28 +00:00
Renovate Bot	5066986c6d	Update module golang.org/x/term to v0.24.0	2024-09-05 00:01:52 +00:00
Michael Kriese	b6c15d4aea	Merge pull request 'Fix typo' (#262 ) from Crown0815/forgejo-runner:main into main Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/262 Reviewed-by: Michael Kriese <michael.kriese@gmx.de>	2024-08-27 09:42:14 +00:00
Crown0815	0c8e1fca49	Fix typo	2024-08-27 09:40:36 +00:00
Michael Kriese	91b76cb17b	chore(renovate): disable replaced `nektos/act`	2024-08-27 09:00:08 +02:00
Earl Warren	82523d1d8e	chore: update the DOER & TOKEN of the build release workflow	2024-08-23 23:31:03 +02:00