mirror of
https://gitea.com/gitea/act_runner.git
synced 2026-08-07 09:24:22 +02:00
4c2ab943a8
gitea can not consume the runner's api by version while it's version mismatches the module version:
```
go: gitea.com/gitea/runner@v3.0.1: invalid version: module contains a go.mod file,
so module path must match major version ("gitea.com/gitea/runner/v3")
```
Fix that by bumping the module version now. The existing `v3.0.0` and `v3.0.1` tags stay unusable, so a new tag is needed after this lands.
Also drop the version `-X` linker flags, which would otherwise have to repeat the new path in both `Makefile` and `.goreleaser.yaml`, where a stale path makes injection silently no-op. Go has recorded the module version in the build info since 1.24, so `Version()` reads it from there, keeping the variable as an override for builds without a VCS stamp.
That part started as https://gitea.com/gitea/runner/pulls/1137 but belongs here: the stamp resolves against the tags that are legal for the module path, so without the `/v3` bump it would report `v1.0.9-0.<ts>-<sha>`. Since `release-nightly.yml` triggers on every push to `main`, splitting them would publish a nightly with a `v1` version.
---------
Co-authored-by: bircni <bircni@icloud.com>
Reviewed-on: https://gitea.com/gitea/runner/pulls/1136
Reviewed-by: techknowlogick <9+techknowlogick@noreply.gitea.com>
Reviewed-by: bircni <bircni@icloud.com>
Co-authored-by: silverwind <me@silverwind.io>
100 lines
2.9 KiB
Go
100 lines
2.9 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package cmd
|
|
|
|
import (
|
|
"bytes"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"gitea.com/gitea/runner/v3/internal/pkg/config"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func runConfigCmd(t *testing.T, configFile string, args ...string) (string, string, error) {
|
|
t.Helper()
|
|
out, errOut := &bytes.Buffer{}, &bytes.Buffer{}
|
|
cmd := loadConfigCmd(&configFile)
|
|
cmd.SetOut(out)
|
|
cmd.SetErr(errOut)
|
|
cmd.SetArgs(args)
|
|
err := cmd.Execute()
|
|
return out.String(), errOut.String(), err
|
|
}
|
|
|
|
func TestConfigCmdGeneratePrintsTheExample(t *testing.T) {
|
|
out, _, err := runConfigCmd(t, "", "generate")
|
|
require.NoError(t, err)
|
|
assert.Equal(t, string(config.Example), out)
|
|
}
|
|
|
|
func TestConfigCmdInitWritesTheMinimalConfig(t *testing.T) {
|
|
dir := t.TempDir()
|
|
file := filepath.Join(dir, "config.yaml")
|
|
|
|
out, _, err := runConfigCmd(t, file, "init")
|
|
require.NoError(t, err)
|
|
assert.Contains(t, out, file)
|
|
content, err := os.ReadFile(file)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, config.Minimal, string(content))
|
|
|
|
_, _, err = runConfigCmd(t, file, "init")
|
|
require.Error(t, err)
|
|
assert.Contains(t, err.Error(), "--force")
|
|
|
|
_, _, err = runConfigCmd(t, file, "init", "--force")
|
|
require.NoError(t, err)
|
|
|
|
t.Chdir(t.TempDir())
|
|
_, _, err = runConfigCmd(t, "", "init")
|
|
require.NoError(t, err)
|
|
assert.FileExists(t, defaultConfigFileNames[0])
|
|
}
|
|
|
|
// The subcommands only wire arguments through, so one pass over all of them is enough.
|
|
func TestConfigCmdEditsTheFile(t *testing.T) {
|
|
file := filepath.Join(t.TempDir(), "config.yaml")
|
|
require.NoError(t, os.WriteFile(file, []byte("runner:\n labels:\n - self-hosted\n"), 0o600))
|
|
|
|
_, _, err := runConfigCmd(t, file, "set", "container.options", "--cpus 2")
|
|
require.NoError(t, err)
|
|
_, _, err = runConfigCmd(t, file, "add", "runner.labels", "ubuntu:docker://node:22")
|
|
require.NoError(t, err)
|
|
_, _, err = runConfigCmd(t, file, "remove", "runner.labels", "self-hosted")
|
|
require.NoError(t, err)
|
|
|
|
out, _, err := runConfigCmd(t, file, "get", "runner.labels")
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "ubuntu:docker://node:22\n", out)
|
|
|
|
out, _, err = runConfigCmd(t, file, "get", "container.options")
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "--cpus 2\n", out)
|
|
}
|
|
|
|
func TestConfigCmdResolvesTheConfigFile(t *testing.T) {
|
|
t.Run("falls back to the working directory", func(t *testing.T) {
|
|
dir := t.TempDir()
|
|
require.NoError(t, os.WriteFile(filepath.Join(dir, "config.yaml"), []byte("runner:\n capacity: 2\n"), 0o600))
|
|
t.Chdir(dir)
|
|
|
|
out, errOut, err := runConfigCmd(t, "", "get", "runner.capacity")
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "2\n", out)
|
|
assert.Contains(t, errOut, "using config file")
|
|
})
|
|
|
|
t.Run("reports that none was found", func(t *testing.T) {
|
|
t.Chdir(t.TempDir())
|
|
|
|
_, _, err := runConfigCmd(t, "", "set", "runner.capacity", "4")
|
|
require.Error(t, err)
|
|
assert.Contains(t, err.Error(), "--config")
|
|
})
|
|
}
|