c214372
c214372f146ce37996ca731c49277e0f4ba8849e9f6a689
cd1cdf4deploy/ansible/inventory/production.examplemodified@@ -45,11 +45,11 @@ grafana_cloud_prom_user=REPLACE_ME # numeric tenant id | ||
| 45 | 45 | grafana_cloud_prom_token=REPLACE_ME # access-policy token |
| 46 | 46 | |
| 47 | 47 | # Optional Actions runner on this host. Generate the token with: |
| 48 | -# shithubd admin runner register --name prod-runner-1 --labels self-hosted,linux,ubuntu-latest --capacity 1 | |
| 48 | +# shithubd admin runner register --name prod-runner-1 --labels self-hosted,linux,ubuntu-latest,x64 --capacity 1 --output json | |
| 49 | 49 | # Store the real token in ansible-vault or your secret manager. |
| 50 | 50 | # shithub_runner_enabled=true |
| 51 | 51 | # shithub_runner_token=REPLACE_ME |
| 52 | -# shithub_runner_labels=self-hosted,linux,ubuntu-latest | |
| 52 | +# shithub_runner_labels=self-hosted,linux,ubuntu-latest,x64 | |
| 53 | 53 | # shithub_runner_capacity=1 |
| 54 | 54 | # shithub_runner_default_image=ghcr.io/shithub/runner-nix:1.0 |
| 55 | 55 | # The role creates shithub-actions on shact0 (172.30.0.1/24), runs |
deploy/ansible/inventory/staging.examplemodified@@ -26,5 +26,5 @@ shithub_email_backend=stdout # no real outbound mail in staging | ||
| 26 | 26 | # Optional Actions runner on this host. |
| 27 | 27 | # shithub_runner_enabled=true |
| 28 | 28 | # shithub_runner_token=REPLACE_ME |
| 29 | -# shithub_runner_labels=self-hosted,linux,ubuntu-latest | |
| 29 | +# shithub_runner_labels=self-hosted,linux,ubuntu-latest,x64 | |
| 30 | 30 | # shithub_runner_capacity=1 |
deploy/ansible/roles/shithubd-runner/defaults/main.ymlmodified@@ -8,6 +8,7 @@ shithub_runner_labels: | ||
| 8 | 8 | - self-hosted |
| 9 | 9 | - linux |
| 10 | 10 | - ubuntu-latest |
| 11 | + - x64 | |
| 11 | 12 | shithub_runner_capacity: 1 |
| 12 | 13 | shithub_runner_poll_interval: 5s |
| 13 | 14 | shithub_runner_workspace_root: /var/lib/shithubd-runner/workspaces |
internal/actions/runnerlabels/labels.gomodified@@ -13,6 +13,13 @@ import ( | ||
| 13 | 13 | |
| 14 | 14 | var labelRE = regexp.MustCompile(`^[A-Za-z0-9_.-]+$`) |
| 15 | 15 | |
| 16 | +var defaultSharedLabels = []string{"self-hosted", "linux", "ubuntu-latest", "x64"} | |
| 17 | + | |
| 18 | +// DefaultShared returns the labels for the built-in shared Linux runner pool. | |
| 19 | +func DefaultShared() []string { | |
| 20 | + return append([]string(nil), defaultSharedLabels...) | |
| 21 | +} | |
| 22 | + | |
| 16 | 23 | // ParseCSV parses a comma-separated label list. |
| 17 | 24 | func ParseCSV(raw string) ([]string, error) { |
| 18 | 25 | raw = strings.TrimSpace(raw) |
internal/runner/config/config.gomodified@@ -100,7 +100,7 @@ func Defaults() Config { | ||
| 100 | 100 | BaseURL: "http://127.0.0.1:8080", |
| 101 | 101 | }, |
| 102 | 102 | Runner: RunnerConfig{ |
| 103 | - Labels: []string{"self-hosted", "linux", "ubuntu-latest"}, | |
| 103 | + Labels: runnerlabels.DefaultShared(), | |
| 104 | 104 | Capacity: 1, |
| 105 | 105 | PollInterval: 5 * time.Second, |
| 106 | 106 | WorkspaceRoot: "/var/lib/shithubd-runner/workspaces", |
internal/runner/config/config_test.gomodified@@ -40,6 +40,9 @@ func TestLoad_DefaultsWithToken(t *testing.T) { | ||
| 40 | 40 | if cfg.Engine.PidsLimit != 512 { |
| 41 | 41 | t.Fatalf("Engine.PidsLimit: %d", cfg.Engine.PidsLimit) |
| 42 | 42 | } |
| 43 | + if want := []string{"self-hosted", "linux", "ubuntu-latest", "x64"}; !reflect.DeepEqual(cfg.Runner.Labels, want) { | |
| 44 | + t.Fatalf("Labels: got %#v want %#v", cfg.Runner.Labels, want) | |
| 45 | + } | |
| 43 | 46 | if want := []string{"api.github.com", "auth.docker.io", "codeload.github.com", "github.com", "objects.githubusercontent.com", "production.cloudflare.docker.com", "registry-1.docker.io", "*.githubusercontent.com"}; !reflect.DeepEqual(cfg.Runner.NetworkAllowlist, want) { |
| 44 | 47 | t.Fatalf("NetworkAllowlist: got %#v want %#v", cfg.Runner.NetworkAllowlist, want) |
| 45 | 48 | } |