runner module: packaging, AUR job, docs
@@ -81,6 +81,20 @@ jobs:
81
81
- ./scripts/aur-ssh-setup.sh
82
82
- ./scripts/publish-aur.sh
83
83
84
# Het aparte runner-pakket. Zelfde AUR-SSH-geheim als publish_aur.
85
publish_aur_runner:
86
stage: release
87
image: archlinux/archlinux:base-devel
88
extends: .on_master
89
needs: [build]
90
allow_failure: true
91
script:
92
- pacman -Syu --noconfirm
93
- pacman -S --noconfirm --needed git openssh curl coreutils shadow util-linux
94
- chmod +x scripts/aur-ssh-setup.sh scripts/publish-aur.sh
95
- ./scripts/aur-ssh-setup.sh
96
- AUR_PKG=bluegit-runner ./scripts/publish-aur.sh
97
84
98
# Laatste job. needs: [publish_aur] geldt ook als die job met
85
99
# allow_failure mislukt. Alleen de POST; de job eindigt meteen groen.
86
100
# De updater bouwt zelf uit git; dit artifact gaat niet mee.
@@ -90,7 +104,7 @@ jobs:
90
104
stage: release
91
105
image: bluegit/base
92
106
extends: .on_master
93
needs: [publish_aur]
107
needs: [publish_aur, publish_aur_runner]
94
108
script:
95
109
- chmod +x scripts/self-update.sh
96
110
- ./scripts/self-update.sh
@@ -81,6 +81,20 @@ jobs:81
- ./scripts/aur-ssh-setup.sh81
- ./scripts/aur-ssh-setup.sh82
- ./scripts/publish-aur.sh82
- ./scripts/publish-aur.sh83
83
84
# Het aparte runner-pakket. Zelfde AUR-SSH-geheim als publish_aur.85
publish_aur_runner:86
stage: release87
image: archlinux/archlinux:base-devel88
extends: .on_master89
needs: [build]90
allow_failure: true91
script:92
- pacman -Syu --noconfirm93
- pacman -S --noconfirm --needed git openssh curl coreutils shadow util-linux94
- chmod +x scripts/aur-ssh-setup.sh scripts/publish-aur.sh95
- ./scripts/aur-ssh-setup.sh96
- AUR_PKG=bluegit-runner ./scripts/publish-aur.sh97
84
# Laatste job. needs: [publish_aur] geldt ook als die job met98
# Laatste job. needs: [publish_aur] geldt ook als die job met85
# allow_failure mislukt. Alleen de POST; de job eindigt meteen groen.99
# allow_failure mislukt. Alleen de POST; de job eindigt meteen groen.86
# De updater bouwt zelf uit git; dit artifact gaat niet mee.100
# De updater bouwt zelf uit git; dit artifact gaat niet mee.@@ -90,7 +104,7 @@ jobs:90
stage: release104
stage: release91
image: bluegit/base105
image: bluegit/base92
extends: .on_master106
extends: .on_master93
needs: [publish_aur]107
needs: [publish_aur, publish_aur_runner]94
script:108
script:95
- chmod +x scripts/self-update.sh109
- chmod +x scripts/self-update.sh96
- ./scripts/self-update.sh110
- ./scripts/self-update.sh@@ -165,6 +165,16 @@ func cmdRegister(args []string) error {
165
165
}
166
166
}
167
167
fmt.Printf("registered runner %q (id %d); config written to %s\n", out.Name, out.ID, *cfgPath)
168
// Met het AUR-pakket: de service is al enabled en wacht op de config.
169
if os.Geteuid() == 0 && *cfgPath == defaultConfig {
170
if _, err := os.Stat("/usr/lib/systemd/system/bluegit-runner.service"); err == nil {
171
if err := exec.Command("systemctl", "enable", "--now", "bluegit-runner.service").Run(); err == nil {
172
_ = exec.Command("systemctl", "restart", "bluegit-runner.service").Run()
173
fmt.Println("bluegit-runner.service started")
174
return nil
175
}
176
}
177
}
168
178
fmt.Println("start it with: sudo systemctl enable --now bluegit-runner")
169
179
return nil
170
180
}
@@ -165,6 +165,16 @@ func cmdRegister(args []string) error {165
}165
}166
}166
}167
fmt.Printf("registered runner %q (id %d); config written to %s\n", out.Name, out.ID, *cfgPath)167
fmt.Printf("registered runner %q (id %d); config written to %s\n", out.Name, out.ID, *cfgPath)168
// Met het AUR-pakket: de service is al enabled en wacht op de config.169
if os.Geteuid() == 0 && *cfgPath == defaultConfig {170
if _, err := os.Stat("/usr/lib/systemd/system/bluegit-runner.service"); err == nil {171
if err := exec.Command("systemctl", "enable", "--now", "bluegit-runner.service").Run(); err == nil {172
_ = exec.Command("systemctl", "restart", "bluegit-runner.service").Run()173
fmt.Println("bluegit-runner.service started")174
return nil175
}176
}177
}168
fmt.Println("start it with: sudo systemctl enable --now bluegit-runner")178
fmt.Println("start it with: sudo systemctl enable --now bluegit-runner")169
return nil179
return nil170
}180
}@@ -0,0 +1,106 @@
1
# bluegit-runner — aparte CI-runner
2
3
`bluegit-runner` draait BlueGit CI-jobs op je eigen machine, in Docker,
4
net als de ingebouwde runner. De runner maakt alleen **uitgaande**
5
HTTPS-verbindingen naar BlueGit (long-poll); er hoeft geen poort open.
6
De ingebouwde BlueGit-runner blijft gewoon bestaan.
7
8
## Installeren (Arch / AUR)
9
10
```sh
11
yay -S bluegit-runner # of: git clone https://aur.archlinux.org/bluegit-runner.git && makepkg -si
12
```
13
14
Het pakket maakt de systeemgebruiker `bluegit-runner` (lid van `docker`),
15
installeert `bluegit-runner.service` en zet die aan. De service start
16
zodra `/etc/bluegit-runner/config.yml` bestaat; een upgrade herstart hem.
17
18
Andere systemen: `go build -o /usr/bin/bluegit-runner ./cmd/bluegit-runner`
19
en kopieer de bestanden uit `packaging/runner/` naar systemd
20
(`bluegit-runner.service`, `sysusers.d`, `tmpfiles.d`).
21
22
## Registreren
23
24
1. In BlueGit: **Instellingen → Runners → Nieuw registratietoken** voor een
25
account-runner, of **Groep → Instellingen → Runners** voor een
26
groepsrunner (maintainer). Het token (`bgrr_…`) is 24 uur geldig,
27
eenmalig, en je ziet het één keer.
28
2. Op de machine:
29
30
```sh
31
sudo bluegit-runner register --url https://git.timfalken.com --token bgrr_... [--name mijn-pc]
32
```
33
34
De runner krijgt een eigen runner-token (`bgr_…`); de server bewaart
35
alleen de hash. Het token staat in `/etc/bluegit-runner/config.yml`
36
(mode 0600, eigenaar `bluegit-runner`). `register` start de service.
37
3. In de UI staat de runner nu als **online**. Intrekken kan daar ook;
38
het token werkt dan meteen niet meer.
39
40
Het registratietoken mag ook via `BLUEGIT_RUNNER_REGISTRATION_TOKEN`.
41
42
## Config
43
44
`/etc/bluegit-runner/config.yml`:
45
46
| sleutel | standaard | |
47
|---|---|---|
48
| `url` | — | BlueGit-adres (door register) |
49
| `token` | — | runner-token (door register) |
50
| `name` | hostname | naam in de UI en in de joblog |
51
| `docker` | `docker` | docker-binary |
52
| `git` | `git` | git-binary |
53
| `work_dir` | `/var/lib/bluegit-runner` | werkmappen en cache |
54
| `network` | `bridge` | docker-netwerk voor jobs zonder services |
55
| `concurrency` | `1` | jobs tegelijk |
56
57
## Welke runner krijgt een job?
58
59
**Repo van een account** — voorkeur onder Instellingen → Runners:
60
61
- *Mijn runners alleen als de BlueGit-runner niet meteen beschikbaar is*
62
(standaard): BlueGit-runner → eigen runners.
63
- *Eigen runners eerst*: eigen runners → BlueGit-runner.
64
65
**Repo van een groep**: groepsrunners → account-runners van maintainers
66
die toestemming gaven (Groep → Instellingen → Runners → "Mijn runners
67
toestaan") → BlueGit-runner. Met **Probeer BlueGit runner eerst** staat
68
de BlueGit-runner vooraan.
69
70
Een trede zonder online runner wordt meteen overgeslagen. Pakt geen
71
runner de job binnen 20 seconden op, of is de BlueGit-runner vol, dan
72
gaat de job naar de volgende trede (en daarna weer rond). Een runner die
73
midden in een job 5 minuten niets van zich laat horen, laat de job
74
mislukken met `runner_system_failure` (retry-regels gelden).
75
76
**Privacy**: een account-runner krijgt alleen jobs uit repo's die zijn
77
eigenaar mag lezen; een groepsrunner alleen uit repo's van die groep.
78
Toestemming van een maintainer telt alleen zolang die maintainer is.
79
Het runner-token mag alleen de repo clonen van een job die die runner op
80
dat moment draait. De rechten van `CI_JOB_TOKEN` zijn ongewijzigd.
81
82
## Wat gebeurt er per job
83
84
1. Long-poll `POST /api/v1/runner/jobs/request` geeft de job: script,
85
variabelen (incl. geheimen en `CI_JOB_TOKEN`), maskers, clone-URL, sha.
86
2. Clone via HTTPS met het runner-token, checkout van de sha.
87
3. Artifacts van eerdere jobs: `GET /api/v1/runner/jobs/{id}/inputs`.
88
4. Container draaien (zelfde code als de ingebouwde runner, incl. image
89
presets en services); log elke seconde naar
90
`POST /api/v1/runner/jobs/{id}/log` (antwoord `{"cancel":true}` stopt de job).
91
5. Artifacts: `PUT /api/v1/runner/jobs/{id}/artifacts` (alleen de gedeclareerde paden).
92
6. `POST /api/v1/runner/jobs/{id}/finish`.
93
94
Heartbeat: `POST /api/v1/runner/heartbeat` elke 30 s; online = contact in
95
de laatste 90 s. De **cache** (`cache:`) blijft lokaal op de
96
runnermachine in `work_dir/cache`.
97
98
De job-UI en de API (`runner` in job-JSON: `{id, name, kind}`) tonen
99
welke runner een job draaide.
100
101
## Problemen
102
103
```sh
104
journalctl -u bluegit-runner -f
105
sudo -u bluegit-runner docker info # moet werken (groep docker)
106
```
@@ -0,0 +1,106 @@1
# bluegit-runner — aparte CI-runner2
3
`bluegit-runner` draait BlueGit CI-jobs op je eigen machine, in Docker,4
net als de ingebouwde runner. De runner maakt alleen **uitgaande**5
HTTPS-verbindingen naar BlueGit (long-poll); er hoeft geen poort open.6
De ingebouwde BlueGit-runner blijft gewoon bestaan.7
8
## Installeren (Arch / AUR)9
10
```sh11
yay -S bluegit-runner # of: git clone https://aur.archlinux.org/bluegit-runner.git && makepkg -si12
```13
14
Het pakket maakt de systeemgebruiker `bluegit-runner` (lid van `docker`),15
installeert `bluegit-runner.service` en zet die aan. De service start16
zodra `/etc/bluegit-runner/config.yml` bestaat; een upgrade herstart hem.17
18
Andere systemen: `go build -o /usr/bin/bluegit-runner ./cmd/bluegit-runner`19
en kopieer de bestanden uit `packaging/runner/` naar systemd20
(`bluegit-runner.service`, `sysusers.d`, `tmpfiles.d`).21
22
## Registreren23
24
1. In BlueGit: **Instellingen → Runners → Nieuw registratietoken** voor een25
account-runner, of **Groep → Instellingen → Runners** voor een26
groepsrunner (maintainer). Het token (`bgrr_…`) is 24 uur geldig,27
eenmalig, en je ziet het één keer.28
2. Op de machine:29
30
```sh31
sudo bluegit-runner register --url https://git.timfalken.com --token bgrr_... [--name mijn-pc]32
```33
34
De runner krijgt een eigen runner-token (`bgr_…`); de server bewaart35
alleen de hash. Het token staat in `/etc/bluegit-runner/config.yml`36
(mode 0600, eigenaar `bluegit-runner`). `register` start de service.37
3. In de UI staat de runner nu als **online**. Intrekken kan daar ook;38
het token werkt dan meteen niet meer.39
40
Het registratietoken mag ook via `BLUEGIT_RUNNER_REGISTRATION_TOKEN`.41
42
## Config43
44
`/etc/bluegit-runner/config.yml`:45
46
| sleutel | standaard | |47
|---|---|---|48
| `url` | — | BlueGit-adres (door register) |49
| `token` | — | runner-token (door register) |50
| `name` | hostname | naam in de UI en in de joblog |51
| `docker` | `docker` | docker-binary |52
| `git` | `git` | git-binary |53
| `work_dir` | `/var/lib/bluegit-runner` | werkmappen en cache |54
| `network` | `bridge` | docker-netwerk voor jobs zonder services |55
| `concurrency` | `1` | jobs tegelijk |56
57
## Welke runner krijgt een job?58
59
**Repo van een account** — voorkeur onder Instellingen → Runners:60
61
- *Mijn runners alleen als de BlueGit-runner niet meteen beschikbaar is*62
(standaard): BlueGit-runner → eigen runners.63
- *Eigen runners eerst*: eigen runners → BlueGit-runner.64
65
**Repo van een groep**: groepsrunners → account-runners van maintainers66
die toestemming gaven (Groep → Instellingen → Runners → "Mijn runners67
toestaan") → BlueGit-runner. Met **Probeer BlueGit runner eerst** staat68
de BlueGit-runner vooraan.69
70
Een trede zonder online runner wordt meteen overgeslagen. Pakt geen71
runner de job binnen 20 seconden op, of is de BlueGit-runner vol, dan72
gaat de job naar de volgende trede (en daarna weer rond). Een runner die73
midden in een job 5 minuten niets van zich laat horen, laat de job74
mislukken met `runner_system_failure` (retry-regels gelden).75
76
**Privacy**: een account-runner krijgt alleen jobs uit repo's die zijn77
eigenaar mag lezen; een groepsrunner alleen uit repo's van die groep.78
Toestemming van een maintainer telt alleen zolang die maintainer is.79
Het runner-token mag alleen de repo clonen van een job die die runner op80
dat moment draait. De rechten van `CI_JOB_TOKEN` zijn ongewijzigd.81
82
## Wat gebeurt er per job83
84
1. Long-poll `POST /api/v1/runner/jobs/request` geeft de job: script,85
variabelen (incl. geheimen en `CI_JOB_TOKEN`), maskers, clone-URL, sha.86
2. Clone via HTTPS met het runner-token, checkout van de sha.87
3. Artifacts van eerdere jobs: `GET /api/v1/runner/jobs/{id}/inputs`.88
4. Container draaien (zelfde code als de ingebouwde runner, incl. image89
presets en services); log elke seconde naar90
`POST /api/v1/runner/jobs/{id}/log` (antwoord `{"cancel":true}` stopt de job).91
5. Artifacts: `PUT /api/v1/runner/jobs/{id}/artifacts` (alleen de gedeclareerde paden).92
6. `POST /api/v1/runner/jobs/{id}/finish`.93
94
Heartbeat: `POST /api/v1/runner/heartbeat` elke 30 s; online = contact in95
de laatste 90 s. De **cache** (`cache:`) blijft lokaal op de96
runnermachine in `work_dir/cache`.97
98
De job-UI en de API (`runner` in job-JSON: `{id, name, kind}`) tonen99
welke runner een job draaide.100
101
## Problemen102
103
```sh104
journalctl -u bluegit-runner -f105
sudo -u bluegit-runner docker info # moet werken (groep docker)106
```@@ -19,7 +19,7 @@ func TestBlueGitExampleFile(t *testing.T) {
19
19
if len(p.Warnings) != 0 {
20
20
t.Fatalf("warnings %v", p.Warnings)
21
21
}
22
if len(p.Jobs) != 6 {
22
if len(p.Jobs) != 7 {
23
23
t.Fatalf("jobs %d", len(p.Jobs))
24
24
}
25
25
by := map[string]Job{}
@@ -77,14 +77,14 @@ func TestBlueGitExampleFile(t *testing.T) {
77
77
web, err := p.ActiveJobs(map[string]string{
78
78
"CI_COMMIT_BRANCH": "master", "CI_PIPELINE_SOURCE": "web",
79
79
})
80
if err != nil || len(web) != 6 {
80
if err != nil || len(web) != 7 {
81
81
t.Fatalf("web op master %d %v", len(web), err)
82
82
}
83
83
84
84
active, err := p.ActiveJobs(map[string]string{
85
85
"CI_COMMIT_BRANCH": "master", "CI_PIPELINE_SOURCE": "push",
86
86
})
87
if err != nil || len(active) != 6 {
87
if err != nil || len(active) != 7 {
88
88
t.Fatalf("master %d %v", len(active), err)
89
89
}
90
90
aur := by["publish_aur"]
@@ -107,8 +107,13 @@ func TestBlueGitExampleFile(t *testing.T) {
107
107
}, aur) != "ready" {
108
108
t.Fatal("publish_aur start na build, vóór self_update")
109
109
}
110
runnerAUR := by["publish_aur_runner"]
111
if !runnerAUR.AllowFailure || len(runnerAUR.Needs) != 1 || runnerAUR.Needs[0] != "build" ||
112
!strings.Contains(strings.Join(runnerAUR.Script, "\n"), "AUR_PKG=bluegit-runner ./scripts/publish-aur.sh") {
113
t.Fatalf("publish_aur_runner: %+v", runnerAUR)
114
}
110
115
upd := by["self_update"]
111
if !upd.NeedsSet || len(upd.Needs) != 1 || upd.Needs[0] != "publish_aur" {
116
if !upd.NeedsSet || len(upd.Needs) != 2 || upd.Needs[0] != "publish_aur" || upd.Needs[1] != "publish_aur_runner" {
112
117
t.Fatalf("self_update hoort op publish_aur te wachten: %+v", upd)
113
118
}
114
119
joined := strings.Join(upd.Script, "\n")
@@ -139,13 +144,13 @@ func TestBlueGitExampleFile(t *testing.T) {
139
144
}
140
145
if Gate(p.Jobs, map[string]string{
141
146
"vet": "success", "test": "success", "frontend_checks": "success",
142
"build": "success", "publish_aur": "success",
147
"build": "success", "publish_aur": "success", "publish_aur_runner": "success",
143
148
}, upd) != "ready" {
144
149
t.Fatal("self_update start na een geslaagde publish_aur")
145
150
}
146
151
if Gate(p.Jobs, map[string]string{
147
152
"vet": "success", "test": "success", "frontend_checks": "success",
148
"build": "success", "publish_aur": "failed",
153
"build": "success", "publish_aur": "failed", "publish_aur_runner": "failed",
149
154
}, upd) != "ready" {
150
155
t.Fatal("een AUR-fout met allow_failure hoort de deploy niet te blokkeren")
151
156
}
@@ -19,7 +19,7 @@ func TestBlueGitExampleFile(t *testing.T) {19
if len(p.Warnings) != 0 {19
if len(p.Warnings) != 0 {20
t.Fatalf("warnings %v", p.Warnings)20
t.Fatalf("warnings %v", p.Warnings)21
}21
}22
if len(p.Jobs) != 6 {22
if len(p.Jobs) != 7 {23
t.Fatalf("jobs %d", len(p.Jobs))23
t.Fatalf("jobs %d", len(p.Jobs))24
}24
}25
by := map[string]Job{}25
by := map[string]Job{}@@ -77,14 +77,14 @@ func TestBlueGitExampleFile(t *testing.T) {77
web, err := p.ActiveJobs(map[string]string{77
web, err := p.ActiveJobs(map[string]string{78
"CI_COMMIT_BRANCH": "master", "CI_PIPELINE_SOURCE": "web",78
"CI_COMMIT_BRANCH": "master", "CI_PIPELINE_SOURCE": "web",79
})79
})80
if err != nil || len(web) != 6 {80
if err != nil || len(web) != 7 {81
t.Fatalf("web op master %d %v", len(web), err)81
t.Fatalf("web op master %d %v", len(web), err)82
}82
}83
83
84
active, err := p.ActiveJobs(map[string]string{84
active, err := p.ActiveJobs(map[string]string{85
"CI_COMMIT_BRANCH": "master", "CI_PIPELINE_SOURCE": "push",85
"CI_COMMIT_BRANCH": "master", "CI_PIPELINE_SOURCE": "push",86
})86
})87
if err != nil || len(active) != 6 {87
if err != nil || len(active) != 7 {88
t.Fatalf("master %d %v", len(active), err)88
t.Fatalf("master %d %v", len(active), err)89
}89
}90
aur := by["publish_aur"]90
aur := by["publish_aur"]@@ -107,8 +107,13 @@ func TestBlueGitExampleFile(t *testing.T) {107
}, aur) != "ready" {107
}, aur) != "ready" {108
t.Fatal("publish_aur start na build, vóór self_update")108
t.Fatal("publish_aur start na build, vóór self_update")109
}109
}110
runnerAUR := by["publish_aur_runner"]111
if !runnerAUR.AllowFailure || len(runnerAUR.Needs) != 1 || runnerAUR.Needs[0] != "build" ||112
!strings.Contains(strings.Join(runnerAUR.Script, "\n"), "AUR_PKG=bluegit-runner ./scripts/publish-aur.sh") {113
t.Fatalf("publish_aur_runner: %+v", runnerAUR)114
}110
upd := by["self_update"]115
upd := by["self_update"]111
if !upd.NeedsSet || len(upd.Needs) != 1 || upd.Needs[0] != "publish_aur" {116
if !upd.NeedsSet || len(upd.Needs) != 2 || upd.Needs[0] != "publish_aur" || upd.Needs[1] != "publish_aur_runner" {112
t.Fatalf("self_update hoort op publish_aur te wachten: %+v", upd)117
t.Fatalf("self_update hoort op publish_aur te wachten: %+v", upd)113
}118
}114
joined := strings.Join(upd.Script, "\n")119
joined := strings.Join(upd.Script, "\n")@@ -139,13 +144,13 @@ func TestBlueGitExampleFile(t *testing.T) {139
}144
}140
if Gate(p.Jobs, map[string]string{145
if Gate(p.Jobs, map[string]string{141
"vet": "success", "test": "success", "frontend_checks": "success",146
"vet": "success", "test": "success", "frontend_checks": "success",142
"build": "success", "publish_aur": "success",147
"build": "success", "publish_aur": "success", "publish_aur_runner": "success",143
}, upd) != "ready" {148
}, upd) != "ready" {144
t.Fatal("self_update start na een geslaagde publish_aur")149
t.Fatal("self_update start na een geslaagde publish_aur")145
}150
}146
if Gate(p.Jobs, map[string]string{151
if Gate(p.Jobs, map[string]string{147
"vet": "success", "test": "success", "frontend_checks": "success",152
"vet": "success", "test": "success", "frontend_checks": "success",148
"build": "success", "publish_aur": "failed",153
"build": "success", "publish_aur": "failed", "publish_aur_runner": "failed",149
}, upd) != "ready" {154
}, upd) != "ready" {150
t.Fatal("een AUR-fout met allow_failure hoort de deploy niet te blokkeren")155
t.Fatal("een AUR-fout met allow_failure hoort de deploy niet te blokkeren")151
}156
}@@ -0,0 +1,35 @@
1
# Maintainer: Tim Falken <tim@timfalken.com>
2
pkgname=bluegit-runner
3
pkgver=20261024090636
4
pkgrel=1
5
pkgdesc='Separate CI runner for BlueGit (runs jobs in Docker on your own machine)'
6
arch=('x86_64' 'aarch64')
7
url='https://git.timfalken.com/timfa/bluegit'
8
license=('MIT')
9
depends=('git' 'docker')
10
makedepends=('go')
11
options=('!debug')
12
install=bluegit-runner.install
13
_commit=6a359db00000000000000000000000000000000a
14
source=("bluegit-${_commit}.tar.gz::https://git.timfalken.com/timfa/bluegit/-/archive/${_commit}/bluegit-${_commit}.tar.gz")
15
sha256sums=('0000000000000000000000000000000000000000000000000000000000000000')
16
17
build() {
18
cd "$srcdir/bluegit-${_commit}"
19
export CGO_ENABLED=0
20
export GOFLAGS='-trimpath'
21
export GOCACHE="${BUILDDIR:-$srcdir}/gocache"
22
export GOPATH="${BUILDDIR:-$srcdir}/gopath"
23
go build -ldflags="-s -w -X main.version=${pkgver}" -o bluegit-runner ./cmd/bluegit-runner
24
}
25
26
package() {
27
cd "$srcdir/bluegit-${_commit}"
28
install -Dm755 bluegit-runner "$pkgdir/usr/bin/bluegit-runner"
29
install -Dm644 packaging/runner/bluegit-runner.service "$pkgdir/usr/lib/systemd/system/bluegit-runner.service"
30
install -Dm644 packaging/runner/sysusers.conf "$pkgdir/usr/lib/sysusers.d/bluegit-runner.conf"
31
install -Dm644 packaging/runner/tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/bluegit-runner.conf"
32
install -Dm644 packaging/runner/config.yml.example "$pkgdir/usr/share/bluegit-runner/config.yml.example"
33
install -Dm644 docs/runner.md "$pkgdir/usr/share/doc/bluegit-runner/README.md"
34
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
35
}
@@ -0,0 +1,35 @@1
# Maintainer: Tim Falken <tim@timfalken.com>2
pkgname=bluegit-runner3
pkgver=202610240906364
pkgrel=15
pkgdesc='Separate CI runner for BlueGit (runs jobs in Docker on your own machine)'6
arch=('x86_64' 'aarch64')7
url='https://git.timfalken.com/timfa/bluegit'8
license=('MIT')9
depends=('git' 'docker')10
makedepends=('go')11
options=('!debug')12
install=bluegit-runner.install13
_commit=6a359db00000000000000000000000000000000a14
source=("bluegit-${_commit}.tar.gz::https://git.timfalken.com/timfa/bluegit/-/archive/${_commit}/bluegit-${_commit}.tar.gz")15
sha256sums=('0000000000000000000000000000000000000000000000000000000000000000')16
17
build() {18
cd "$srcdir/bluegit-${_commit}"19
export CGO_ENABLED=020
export GOFLAGS='-trimpath'21
export GOCACHE="${BUILDDIR:-$srcdir}/gocache"22
export GOPATH="${BUILDDIR:-$srcdir}/gopath"23
go build -ldflags="-s -w -X main.version=${pkgver}" -o bluegit-runner ./cmd/bluegit-runner24
}25
26
package() {27
cd "$srcdir/bluegit-${_commit}"28
install -Dm755 bluegit-runner "$pkgdir/usr/bin/bluegit-runner"29
install -Dm644 packaging/runner/bluegit-runner.service "$pkgdir/usr/lib/systemd/system/bluegit-runner.service"30
install -Dm644 packaging/runner/sysusers.conf "$pkgdir/usr/lib/sysusers.d/bluegit-runner.conf"31
install -Dm644 packaging/runner/tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/bluegit-runner.conf"32
install -Dm644 packaging/runner/config.yml.example "$pkgdir/usr/share/bluegit-runner/config.yml.example"33
install -Dm644 docs/runner.md "$pkgdir/usr/share/doc/bluegit-runner/README.md"34
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"35
}@@ -0,0 +1,43 @@
1
# bluegit-runner: systemd-unit met User=bluegit-runner (groep docker).
2
# Na installatie draait de service zodra er een config is
3
# (bluegit-runner register). Een upgrade herstart de service.
4
# Zonder draaiende systemd (chroot of container) faalt de transactie niet.
5
6
_bgr_systemctl() {
7
if ! command -v systemctl >/dev/null 2>&1 || [[ ! -d /run/systemd/system ]]; then
8
echo "bluegit-runner: systemd draait niet; de service is niet aangepast."
9
return 0
10
fi
11
systemctl "$@" || true
12
}
13
14
post_install() {
15
systemd-sysusers bluegit-runner.conf || true
16
systemd-tmpfiles --create bluegit-runner.conf || true
17
_bgr_systemctl daemon-reload
18
_bgr_systemctl enable --now bluegit-runner.service
19
if [[ ! -f /etc/bluegit-runner/config.yml ]]; then
20
cat <<'MSG'
21
bluegit-runner: register this machine to start the service:
22
1. In BlueGit: Settings → Runners → "New registration token"
23
(or a group's Settings → Runners).
24
2. sudo bluegit-runner register --url https://your-bluegit --token bgrr_...
25
The service is enabled and starts as soon as the config exists.
26
MSG
27
fi
28
}
29
30
post_upgrade() {
31
systemd-sysusers bluegit-runner.conf || true
32
systemd-tmpfiles --create bluegit-runner.conf || true
33
_bgr_systemctl daemon-reload
34
_bgr_systemctl try-restart bluegit-runner.service
35
}
36
37
pre_remove() {
38
_bgr_systemctl disable --now bluegit-runner.service
39
}
40
41
post_remove() {
42
_bgr_systemctl daemon-reload
43
}
@@ -0,0 +1,43 @@1
# bluegit-runner: systemd-unit met User=bluegit-runner (groep docker).2
# Na installatie draait de service zodra er een config is3
# (bluegit-runner register). Een upgrade herstart de service.4
# Zonder draaiende systemd (chroot of container) faalt de transactie niet.5
6
_bgr_systemctl() {7
if ! command -v systemctl >/dev/null 2>&1 || [[ ! -d /run/systemd/system ]]; then8
echo "bluegit-runner: systemd draait niet; de service is niet aangepast."9
return 010
fi11
systemctl "$@" || true12
}13
14
post_install() {15
systemd-sysusers bluegit-runner.conf || true16
systemd-tmpfiles --create bluegit-runner.conf || true17
_bgr_systemctl daemon-reload18
_bgr_systemctl enable --now bluegit-runner.service19
if [[ ! -f /etc/bluegit-runner/config.yml ]]; then20
cat <<'MSG'21
bluegit-runner: register this machine to start the service:22
1. In BlueGit: Settings → Runners → "New registration token"23
(or a group's Settings → Runners).24
2. sudo bluegit-runner register --url https://your-bluegit --token bgrr_...25
The service is enabled and starts as soon as the config exists.26
MSG27
fi28
}29
30
post_upgrade() {31
systemd-sysusers bluegit-runner.conf || true32
systemd-tmpfiles --create bluegit-runner.conf || true33
_bgr_systemctl daemon-reload34
_bgr_systemctl try-restart bluegit-runner.service35
}36
37
pre_remove() {38
_bgr_systemctl disable --now bluegit-runner.service39
}40
41
post_remove() {42
_bgr_systemctl daemon-reload43
}@@ -0,0 +1,26 @@
1
[Unit]
2
Description=BlueGit runner (separate CI runner)
3
Documentation=https://git.timfalken.com/timfa/bluegit/-/blob/master/docs/runner.md
4
After=network-online.target docker.service
5
Wants=network-online.target
6
# Pas na "bluegit-runner register" is er een config.
7
ConditionPathExists=/etc/bluegit-runner/config.yml
8
9
[Service]
10
Type=simple
11
User=bluegit-runner
12
Group=bluegit-runner
13
# Jobs draaien in Docker-containers via de socket (root:docker).
14
SupplementaryGroups=docker
15
ExecStart=/usr/bin/bluegit-runner run --config /etc/bluegit-runner/config.yml
16
Restart=always
17
RestartSec=10
18
NoNewPrivileges=true
19
ProtectSystem=strict
20
ProtectHome=true
21
StateDirectory=bluegit-runner
22
ReadWritePaths=/var/lib/bluegit-runner
23
PrivateTmp=true
24
25
[Install]
26
WantedBy=multi-user.target
@@ -0,0 +1,26 @@1
[Unit]2
Description=BlueGit runner (separate CI runner)3
Documentation=https://git.timfalken.com/timfa/bluegit/-/blob/master/docs/runner.md4
After=network-online.target docker.service5
Wants=network-online.target6
# Pas na "bluegit-runner register" is er een config.7
ConditionPathExists=/etc/bluegit-runner/config.yml8
9
[Service]10
Type=simple11
User=bluegit-runner12
Group=bluegit-runner13
# Jobs draaien in Docker-containers via de socket (root:docker).14
SupplementaryGroups=docker15
ExecStart=/usr/bin/bluegit-runner run --config /etc/bluegit-runner/config.yml16
Restart=always17
RestartSec=1018
NoNewPrivileges=true19
ProtectSystem=strict20
ProtectHome=true21
StateDirectory=bluegit-runner22
ReadWritePaths=/var/lib/bluegit-runner23
PrivateTmp=true24
25
[Install]26
WantedBy=multi-user.target@@ -0,0 +1,12 @@
1
# /etc/bluegit-runner/config.yml — written by "bluegit-runner register".
2
# url and token are filled in by register; the token is the runner's own
3
# token (bgr_...), only its hash is stored on the server.
4
url: https://git.example.com
5
token: ""
6
name: my-machine
7
# Optional:
8
# docker: docker
9
# git: git
10
# work_dir: /var/lib/bluegit-runner
11
# network: bridge
12
# concurrency: 1
@@ -0,0 +1,12 @@1
# /etc/bluegit-runner/config.yml — written by "bluegit-runner register".2
# url and token are filled in by register; the token is the runner's own3
# token (bgr_...), only its hash is stored on the server.4
url: https://git.example.com5
token: ""6
name: my-machine7
# Optional:8
# docker: docker9
# git: git10
# work_dir: /var/lib/bluegit-runner11
# network: bridge12
# concurrency: 1@@ -0,0 +1,2 @@
1
u bluegit-runner - "BlueGit runner" /var/lib/bluegit-runner /usr/bin/nologin
2
m bluegit-runner docker
@@ -0,0 +1,2 @@1
u bluegit-runner - "BlueGit runner" /var/lib/bluegit-runner /usr/bin/nologin2
m bluegit-runner docker@@ -0,0 +1,2 @@
1
d /etc/bluegit-runner 0750 root bluegit-runner -
2
d /var/lib/bluegit-runner 0750 bluegit-runner bluegit-runner -
@@ -0,0 +1,2 @@1
d /etc/bluegit-runner 0750 root bluegit-runner -2
d /var/lib/bluegit-runner 0750 bluegit-runner bluegit-runner -@@ -1,6 +1,8 @@
1
1
#!/usr/bin/env bash
2
# Update the AUR package bluegit from the BlueGit source archive of this commit.
3
# Pushes ssh://aur@aur.archlinux.org/bluegit.git master. AUR only accepts master.
2
# Update an AUR package from the BlueGit source archive of this commit.
3
# AUR_PKG=bluegit (default, packaging/aur) or AUR_PKG=bluegit-runner
4
# (packaging/aur-runner). Pushes ssh://aur@aur.archlinux.org/$AUR_PKG.git
5
# master. AUR only accepts master.
4
6
set -euo pipefail
5
7
6
8
ROOT="$(cd "$(dirname "$0")/.." && pwd)"
@@ -88,6 +90,14 @@ else
88
90
fi
89
91
VERSION="$(pkgver_of_commit "$ROOT" "$COMMIT")"
90
92
93
PKG="${AUR_PKG:-bluegit}"
94
case "$PKG" in
95
bluegit) PKGDIR="$ROOT/packaging/aur" ;;
96
bluegit-runner) PKGDIR="$ROOT/packaging/aur-runner" ;;
97
*) echo "Unknown AUR_PKG: $PKG" >&2; exit 1 ;;
98
esac
99
INSTALL_FILE="${PKG}.install"
100
91
101
TMPDIR="${TMPDIR:-/tmp}"
92
102
WORKDIR="$(mktemp -d "$TMPDIR/bluegit-aur-XXXXXX")"
93
103
cleanup() { rm -rf "$WORKDIR"; }
@@ -102,26 +112,26 @@ if ! curl -fsSL "$SOURCE_URL" -o "$TMP_SOURCE"; then
102
112
fi
103
113
SOURCE_SHA="$(sha256sum "$TMP_SOURCE" | awk '{print $1}')"
104
114
105
dest="$WORKDIR/bluegit"
106
clone_or_init_aur_repo "bluegit" "$dest"
115
dest="$WORKDIR/$PKG"
116
clone_or_init_aur_repo "$PKG" "$dest"
107
117
cd "$dest"
108
118
git config user.name "${AUR_GIT_AUTHOR_NAME:-BlueGit release bot}"
109
119
git config user.email "${AUR_GIT_AUTHOR_EMAIL:-noreply@example.invalid}"
110
cp "$ROOT/packaging/aur/PKGBUILD" PKGBUILD
111
cp "$ROOT/packaging/aur/bluegit.install" bluegit.install
120
cp "$PKGDIR/PKGBUILD" PKGBUILD
121
cp "$PKGDIR/$INSTALL_FILE" "$INSTALL_FILE"
112
122
rewrite_pkgbuild "$VERSION" "$COMMIT" "$SOURCE_SHA" PKGBUILD
113
123
generate_srcinfo
114
124
115
if git diff --quiet -- PKGBUILD .SRCINFO bluegit.install 2>/dev/null && git rev-parse --verify HEAD >/dev/null 2>&1; then
116
echo "AUR repo already up to date: bluegit ${VERSION}"
125
if git diff --quiet -- PKGBUILD .SRCINFO "$INSTALL_FILE" 2>/dev/null && git rev-parse --verify HEAD >/dev/null 2>&1; then
126
echo "AUR repo already up to date: ${PKG} ${VERSION}"
117
127
exit 0
118
128
fi
119
129
120
git add PKGBUILD .SRCINFO bluegit.install
130
git add PKGBUILD .SRCINFO "$INSTALL_FILE"
121
131
if git rev-parse --verify HEAD >/dev/null 2>&1; then
122
132
git commit -m "upstream ${VERSION}"
123
133
else
124
134
git commit -m "initial import ${VERSION}"
125
135
fi
126
136
git push -u origin master
127
echo "AUR updated: bluegit ${VERSION}"
137
echo "AUR updated: ${PKG} ${VERSION}"
@@ -1,6 +1,8 @@1
#!/usr/bin/env bash1
#!/usr/bin/env bash2
# Update the AUR package bluegit from the BlueGit source archive of this commit.2
# Update an AUR package from the BlueGit source archive of this commit.3
# Pushes ssh://aur@aur.archlinux.org/bluegit.git master. AUR only accepts master.3
# AUR_PKG=bluegit (default, packaging/aur) or AUR_PKG=bluegit-runner4
# (packaging/aur-runner). Pushes ssh://aur@aur.archlinux.org/$AUR_PKG.git5
# master. AUR only accepts master.4
set -euo pipefail6
set -euo pipefail5
7
6
ROOT="$(cd "$(dirname "$0")/.." && pwd)"8
ROOT="$(cd "$(dirname "$0")/.." && pwd)"@@ -88,6 +90,14 @@ else88
fi90
fi89
VERSION="$(pkgver_of_commit "$ROOT" "$COMMIT")"91
VERSION="$(pkgver_of_commit "$ROOT" "$COMMIT")"90
92
93
PKG="${AUR_PKG:-bluegit}"94
case "$PKG" in95
bluegit) PKGDIR="$ROOT/packaging/aur" ;;96
bluegit-runner) PKGDIR="$ROOT/packaging/aur-runner" ;;97
*) echo "Unknown AUR_PKG: $PKG" >&2; exit 1 ;;98
esac99
INSTALL_FILE="${PKG}.install"100
91
TMPDIR="${TMPDIR:-/tmp}"101
TMPDIR="${TMPDIR:-/tmp}"92
WORKDIR="$(mktemp -d "$TMPDIR/bluegit-aur-XXXXXX")"102
WORKDIR="$(mktemp -d "$TMPDIR/bluegit-aur-XXXXXX")"93
cleanup() { rm -rf "$WORKDIR"; }103
cleanup() { rm -rf "$WORKDIR"; }@@ -102,26 +112,26 @@ if ! curl -fsSL "$SOURCE_URL" -o "$TMP_SOURCE"; then102
fi112
fi103
SOURCE_SHA="$(sha256sum "$TMP_SOURCE" | awk '{print $1}')"113
SOURCE_SHA="$(sha256sum "$TMP_SOURCE" | awk '{print $1}')"104
114
105
dest="$WORKDIR/bluegit"115
dest="$WORKDIR/$PKG"106
clone_or_init_aur_repo "bluegit" "$dest"116
clone_or_init_aur_repo "$PKG" "$dest"107
cd "$dest"117
cd "$dest"108
git config user.name "${AUR_GIT_AUTHOR_NAME:-BlueGit release bot}"118
git config user.name "${AUR_GIT_AUTHOR_NAME:-BlueGit release bot}"109
git config user.email "${AUR_GIT_AUTHOR_EMAIL:-noreply@example.invalid}"119
git config user.email "${AUR_GIT_AUTHOR_EMAIL:-noreply@example.invalid}"110
cp "$ROOT/packaging/aur/PKGBUILD" PKGBUILD120
cp "$PKGDIR/PKGBUILD" PKGBUILD111
cp "$ROOT/packaging/aur/bluegit.install" bluegit.install121
cp "$PKGDIR/$INSTALL_FILE" "$INSTALL_FILE"112
rewrite_pkgbuild "$VERSION" "$COMMIT" "$SOURCE_SHA" PKGBUILD122
rewrite_pkgbuild "$VERSION" "$COMMIT" "$SOURCE_SHA" PKGBUILD113
generate_srcinfo123
generate_srcinfo114
124
115
if git diff --quiet -- PKGBUILD .SRCINFO bluegit.install 2>/dev/null && git rev-parse --verify HEAD >/dev/null 2>&1; then125
if git diff --quiet -- PKGBUILD .SRCINFO "$INSTALL_FILE" 2>/dev/null && git rev-parse --verify HEAD >/dev/null 2>&1; then116
echo "AUR repo already up to date: bluegit ${VERSION}"126
echo "AUR repo already up to date: ${PKG} ${VERSION}"117
exit 0127
exit 0118
fi128
fi119
129
120
git add PKGBUILD .SRCINFO bluegit.install130
git add PKGBUILD .SRCINFO "$INSTALL_FILE"121
if git rev-parse --verify HEAD >/dev/null 2>&1; then131
if git rev-parse --verify HEAD >/dev/null 2>&1; then122
git commit -m "upstream ${VERSION}"132
git commit -m "upstream ${VERSION}"123
else133
else124
git commit -m "initial import ${VERSION}"134
git commit -m "initial import ${VERSION}"125
fi135
fi126
git push -u origin master136
git push -u origin master127
echo "AUR updated: bluegit ${VERSION}"137
echo "AUR updated: ${PKG} ${VERSION}"