Merge branch 'cursor/aur-pkgver-65da' into 'master'
fix: AUR-pkgver volgt de committer-tijd See merge request Timfa/bluegit!43
@@ -10,7 +10,7 @@ Er is één source-package, `bluegit`. Geen `-bin`. De PKGBUILD haalt de GitLab-
10
10
https://gitlab.com/Timfa/bluegit/-/archive/<commit>/bluegit-<commit>.tar.gz
11
11
```
12
12
13
Die map heet `bluegit-<commit>`. `pkgver` is `YYYYMMDDHHMMSS`. De CI-job neemt `CI_COMMIT_TIMESTAMP`, of anders de klok van de job. Het lokale script neemt de UTC-committertijd van de commit, zodat dezelfde sha dezelfde `pkgver` houdt. `pkgrel` gaat terug naar 1. `_commit` is de volledige sha. Het CI-script vult `sha256sums` met de hash van dat archief. Het lokale script doet hetzelfde met `updpkgsums`. Beide maken `.SRCINFO` opnieuw met `makepkg --printsrcinfo`. Draait de CI-job als root, dan doet gebruiker `aurbuild` dat (`AUR_MAKEPKG_USER` overschrijft de naam). De gedeelde functies staan in `scripts/aur-common.sh`.
13
Die map heet `bluegit-<commit>`. `pkgver` is `YYYYMMDDHHMMSS`, de UTC-committertijd van de commit. De CI-job neemt `CI_COMMIT_TIMESTAMP` (ISO 8601). Ontbreekt die, dan neemt `publish-aur.sh` `git show -s --format=%cI` en rekent die om naar UTC. Het lokale script en de self-updater gebruiken dezelfde committer-tijd, zodat dezelfde sha dezelfde `pkgver` houdt. `pkgrel` gaat terug naar 1. `_commit` is de volledige sha. Het CI-script vult `sha256sums` met de hash van dat archief. Het lokale script doet hetzelfde met `updpkgsums`. Beide maken `.SRCINFO` opnieuw met `makepkg --printsrcinfo`. Draait de CI-job als root, dan doet gebruiker `aurbuild` dat (`AUR_MAKEPKG_USER` overschrijft de naam). De gedeelde functies staan in `scripts/aur-common.sh`.
14
14
15
15
De lokale `packaging/arch/PKGBUILD` blijft voor een build uit de werkboom. Die gaat niet naar de AUR.
16
16
@@ -10,7 +10,7 @@ Er is één source-package, `bluegit`. Geen `-bin`. De PKGBUILD haalt de GitLab-10
https://gitlab.com/Timfa/bluegit/-/archive/<commit>/bluegit-<commit>.tar.gz10
https://gitlab.com/Timfa/bluegit/-/archive/<commit>/bluegit-<commit>.tar.gz11
```11
```12
12
13
Die map heet `bluegit-<commit>`. `pkgver` is `YYYYMMDDHHMMSS`. De CI-job neemt `CI_COMMIT_TIMESTAMP`, of anders de klok van de job. Het lokale script neemt de UTC-committertijd van de commit, zodat dezelfde sha dezelfde `pkgver` houdt. `pkgrel` gaat terug naar 1. `_commit` is de volledige sha. Het CI-script vult `sha256sums` met de hash van dat archief. Het lokale script doet hetzelfde met `updpkgsums`. Beide maken `.SRCINFO` opnieuw met `makepkg --printsrcinfo`. Draait de CI-job als root, dan doet gebruiker `aurbuild` dat (`AUR_MAKEPKG_USER` overschrijft de naam). De gedeelde functies staan in `scripts/aur-common.sh`.13
Die map heet `bluegit-<commit>`. `pkgver` is `YYYYMMDDHHMMSS`, de UTC-committertijd van de commit. De CI-job neemt `CI_COMMIT_TIMESTAMP` (ISO 8601). Ontbreekt die, dan neemt `publish-aur.sh` `git show -s --format=%cI` en rekent die om naar UTC. Het lokale script en de self-updater gebruiken dezelfde committer-tijd, zodat dezelfde sha dezelfde `pkgver` houdt. `pkgrel` gaat terug naar 1. `_commit` is de volledige sha. Het CI-script vult `sha256sums` met de hash van dat archief. Het lokale script doet hetzelfde met `updpkgsums`. Beide maken `.SRCINFO` opnieuw met `makepkg --printsrcinfo`. Draait de CI-job als root, dan doet gebruiker `aurbuild` dat (`AUR_MAKEPKG_USER` overschrijft de naam). De gedeelde functies staan in `scripts/aur-common.sh`.14
14
15
De lokale `packaging/arch/PKGBUILD` blijft voor een build uit de werkboom. Die gaat niet naar de AUR.15
De lokale `packaging/arch/PKGBUILD` blijft voor een build uit de werkboom. Die gaat niet naar de AUR.16
16
@@ -72,7 +72,7 @@ $NAAM =~ $PATROON
72
72
73
73
`changes` kijkt naar de diff van de push. Is die diff niet te bepalen, dan geldt de voorwaarde. `exists` eist dat elk pad in de commit staat.
74
74
75
Voorgedefinieerd, in rules en in de container: `CI`, `CI_COMMIT_SHA`, `CI_COMMIT_SHORT_SHA`, `CI_COMMIT_BRANCH`, `CI_COMMIT_TAG`, `CI_COMMIT_REF`, `CI_COMMIT_REF_NAME`, `CI_COMMIT_REF_SLUG`, `CI_COMMIT_TITLE`, `CI_DEFAULT_BRANCH`, `CI_PIPELINE_ID`, `CI_PIPELINE_SOURCE`, `CI_PIPELINE_URL`, `CI_PROJECT_PATH`, `CI_PROJECT_NAME`, `CI_PROJECT_NAMESPACE`, `CI_PROJECT_URL`, `CI_JOB_ID`, `CI_JOB_NAME`, `CI_JOB_STAGE`, `CI_JOB_URL`, `CI_JOB_TOKEN`, `CI_API_URL`, `CI_CONFIG_PATH`, `CI_SERVER_NAME`. Op een tag is `CI_COMMIT_BRANCH` leeg. `CI_PIPELINE_SOURCE` is `push`, `web` of `merge_request_event`.
75
Voorgedefinieerd, in rules en in de container: `CI`, `CI_COMMIT_SHA`, `CI_COMMIT_SHORT_SHA`, `CI_COMMIT_BRANCH`, `CI_COMMIT_TAG`, `CI_COMMIT_REF`, `CI_COMMIT_REF_NAME`, `CI_COMMIT_REF_SLUG`, `CI_COMMIT_TITLE`, `CI_COMMIT_TIMESTAMP`, `CI_DEFAULT_BRANCH`, `CI_PIPELINE_ID`, `CI_PIPELINE_SOURCE`, `CI_PIPELINE_URL`, `CI_PROJECT_PATH`, `CI_PROJECT_NAME`, `CI_PROJECT_NAMESPACE`, `CI_PROJECT_URL`, `CI_JOB_ID`, `CI_JOB_NAME`, `CI_JOB_STAGE`, `CI_JOB_URL`, `CI_JOB_TOKEN`, `CI_API_URL`, `CI_CONFIG_PATH`, `CI_SERVER_NAME`. `CI_COMMIT_TIMESTAMP` is de committer-tijd in ISO 8601. Op een tag is `CI_COMMIT_BRANCH` leeg. `CI_PIPELINE_SOURCE` is `push`, `web` of `merge_request_event`.
76
76
77
77
Een merge-request-pipeline start bij het openen van de merge request, bij elke push naar de bronbranch, en opnieuw wanneer iemand naar de doelbranch pusht. Die laatste draait nog steeds op de commit van de bronbranch, niet op een samengevoegde boom. `CI_PIPELINE_SOURCE` is dan `merge_request_event`. Daarbij horen `CI_MERGE_REQUEST_ID`, `CI_MERGE_REQUEST_IID`, `CI_MERGE_REQUEST_TITLE`, `CI_MERGE_REQUEST_SOURCE_BRANCH_NAME`, `CI_MERGE_REQUEST_SOURCE_BRANCH_SHA`, `CI_MERGE_REQUEST_TARGET_BRANCH_NAME`, `CI_MERGE_REQUEST_TARGET_BRANCH_SHA`, `CI_MERGE_REQUEST_PROJECT_PATH` en `CI_MERGE_REQUEST_PROJECT_URL`, in de rules én in de container. De pipeline draait op de commit van de bronbranch. Jobs zonder `rules` en zonder `only: merge_requests` doen daar niet aan mee. `only: merge_requests` en `except: merge_requests` werken wel. Zodra zo'n bestand jobs voor de merge request kiest, mag er pas gemerged worden als de nieuwste merge-request-pipeline geslaagd is. Een job met `allow_failure` mag mislukken, maar moet wel af zijn. Een job die nog loopt, in de wachtrij staat, op manual staat of geannuleerd is, houdt de merge tegen.
78
78
@@ -72,7 +72,7 @@ $NAAM =~ $PATROON72
72
73
`changes` kijkt naar de diff van de push. Is die diff niet te bepalen, dan geldt de voorwaarde. `exists` eist dat elk pad in de commit staat.73
`changes` kijkt naar de diff van de push. Is die diff niet te bepalen, dan geldt de voorwaarde. `exists` eist dat elk pad in de commit staat.74
74
75
Voorgedefinieerd, in rules en in de container: `CI`, `CI_COMMIT_SHA`, `CI_COMMIT_SHORT_SHA`, `CI_COMMIT_BRANCH`, `CI_COMMIT_TAG`, `CI_COMMIT_REF`, `CI_COMMIT_REF_NAME`, `CI_COMMIT_REF_SLUG`, `CI_COMMIT_TITLE`, `CI_DEFAULT_BRANCH`, `CI_PIPELINE_ID`, `CI_PIPELINE_SOURCE`, `CI_PIPELINE_URL`, `CI_PROJECT_PATH`, `CI_PROJECT_NAME`, `CI_PROJECT_NAMESPACE`, `CI_PROJECT_URL`, `CI_JOB_ID`, `CI_JOB_NAME`, `CI_JOB_STAGE`, `CI_JOB_URL`, `CI_JOB_TOKEN`, `CI_API_URL`, `CI_CONFIG_PATH`, `CI_SERVER_NAME`. Op een tag is `CI_COMMIT_BRANCH` leeg. `CI_PIPELINE_SOURCE` is `push`, `web` of `merge_request_event`.75
Voorgedefinieerd, in rules en in de container: `CI`, `CI_COMMIT_SHA`, `CI_COMMIT_SHORT_SHA`, `CI_COMMIT_BRANCH`, `CI_COMMIT_TAG`, `CI_COMMIT_REF`, `CI_COMMIT_REF_NAME`, `CI_COMMIT_REF_SLUG`, `CI_COMMIT_TITLE`, `CI_COMMIT_TIMESTAMP`, `CI_DEFAULT_BRANCH`, `CI_PIPELINE_ID`, `CI_PIPELINE_SOURCE`, `CI_PIPELINE_URL`, `CI_PROJECT_PATH`, `CI_PROJECT_NAME`, `CI_PROJECT_NAMESPACE`, `CI_PROJECT_URL`, `CI_JOB_ID`, `CI_JOB_NAME`, `CI_JOB_STAGE`, `CI_JOB_URL`, `CI_JOB_TOKEN`, `CI_API_URL`, `CI_CONFIG_PATH`, `CI_SERVER_NAME`. `CI_COMMIT_TIMESTAMP` is de committer-tijd in ISO 8601. Op een tag is `CI_COMMIT_BRANCH` leeg. `CI_PIPELINE_SOURCE` is `push`, `web` of `merge_request_event`.76
76
77
Een merge-request-pipeline start bij het openen van de merge request, bij elke push naar de bronbranch, en opnieuw wanneer iemand naar de doelbranch pusht. Die laatste draait nog steeds op de commit van de bronbranch, niet op een samengevoegde boom. `CI_PIPELINE_SOURCE` is dan `merge_request_event`. Daarbij horen `CI_MERGE_REQUEST_ID`, `CI_MERGE_REQUEST_IID`, `CI_MERGE_REQUEST_TITLE`, `CI_MERGE_REQUEST_SOURCE_BRANCH_NAME`, `CI_MERGE_REQUEST_SOURCE_BRANCH_SHA`, `CI_MERGE_REQUEST_TARGET_BRANCH_NAME`, `CI_MERGE_REQUEST_TARGET_BRANCH_SHA`, `CI_MERGE_REQUEST_PROJECT_PATH` en `CI_MERGE_REQUEST_PROJECT_URL`, in de rules én in de container. De pipeline draait op de commit van de bronbranch. Jobs zonder `rules` en zonder `only: merge_requests` doen daar niet aan mee. `only: merge_requests` en `except: merge_requests` werken wel. Zodra zo'n bestand jobs voor de merge request kiest, mag er pas gemerged worden als de nieuwste merge-request-pipeline geslaagd is. Een job met `allow_failure` mag mislukken, maar moet wel af zijn. Een job die nog loopt, in de wachtrij staat, op manual staat of geannuleerd is, houdt de merge tegen.77
Een merge-request-pipeline start bij het openen van de merge request, bij elke push naar de bronbranch, en opnieuw wanneer iemand naar de doelbranch pusht. Die laatste draait nog steeds op de commit van de bronbranch, niet op een samengevoegde boom. `CI_PIPELINE_SOURCE` is dan `merge_request_event`. Daarbij horen `CI_MERGE_REQUEST_ID`, `CI_MERGE_REQUEST_IID`, `CI_MERGE_REQUEST_TITLE`, `CI_MERGE_REQUEST_SOURCE_BRANCH_NAME`, `CI_MERGE_REQUEST_SOURCE_BRANCH_SHA`, `CI_MERGE_REQUEST_TARGET_BRANCH_NAME`, `CI_MERGE_REQUEST_TARGET_BRANCH_SHA`, `CI_MERGE_REQUEST_PROJECT_PATH` en `CI_MERGE_REQUEST_PROJECT_URL`, in de rules én in de container. De pipeline draait op de commit van de bronbranch. Jobs zonder `rules` en zonder `only: merge_requests` doen daar niet aan mee. `only: merge_requests` en `except: merge_requests` werken wel. Zodra zo'n bestand jobs voor de merge request kiest, mag er pas gemerged worden als de nieuwste merge-request-pipeline geslaagd is. Een job met `allow_failure` mag mislukken, maar moet wel af zijn. Een job die nog loopt, in de wachtrij staat, op manual staat of geannuleerd is, houdt de merge tegen.78
78
@@ -46,6 +46,9 @@ func Variables(r Ref) map[string]string {
46
46
"CI_PROJECT_URL": r.ProjectURL,
47
47
"CI_API_URL": r.APIURL,
48
48
}
49
if r.Timestamp != "" {
50
env["CI_COMMIT_TIMESTAMP"] = r.Timestamp
51
}
49
52
if kind == "tag" {
50
53
env["CI_COMMIT_TAG"] = name
51
54
} else {
@@ -46,6 +46,9 @@ func Variables(r Ref) map[string]string {46
"CI_PROJECT_URL": r.ProjectURL,46
"CI_PROJECT_URL": r.ProjectURL,47
"CI_API_URL": r.APIURL,47
"CI_API_URL": r.APIURL,48
}48
}49
if r.Timestamp != "" {50
env["CI_COMMIT_TIMESTAMP"] = r.Timestamp51
}49
if kind == "tag" {52
if kind == "tag" {50
env["CI_COMMIT_TAG"] = name53
env["CI_COMMIT_TAG"] = name51
} else {54
} else {@@ -133,6 +133,7 @@ type Ref struct {
133
133
Name string
134
134
Kind string
135
135
Title string
136
Timestamp string // committer-tijd, ISO 8601
136
137
DefaultBranch string
137
138
Source string
138
139
ProjectPath string
@@ -133,6 +133,7 @@ type Ref struct {133
Name string133
Name string134
Kind string134
Kind string135
Title string135
Title string136
Timestamp string // committer-tijd, ISO 8601136
DefaultBranch string137
DefaultBranch string137
Source string138
Source string138
ProjectPath string139
ProjectPath string@@ -250,6 +250,13 @@ func TestMaskAndVariables(t *testing.T) {
250
250
if env["CI_COMMIT_TAG"] != "v1.2.0" || env["CI_COMMIT_BRANCH"] != "" || env["CI_COMMIT_SHORT_SHA"] != "abcdef12" {
251
251
t.Fatalf("%v", env)
252
252
}
253
if _, ok := env["CI_COMMIT_TIMESTAMP"]; ok {
254
t.Fatal("lege committer-tijd hoort geen variabele te zetten")
255
}
256
stamped := Variables(Ref{SHA: "abcdef1234567890", FullRef: "refs/heads/master", Timestamp: "2026-10-22T22:32:33+00:00"})
257
if stamped["CI_COMMIT_TIMESTAMP"] != "2026-10-22T22:32:33+00:00" {
258
t.Fatalf("timestamp: %q", stamped["CI_COMMIT_TIMESTAMP"])
259
}
253
260
if env["CI_DEFAULT_BRANCH"] != "master" || env["CI_PROJECT_NAME"] != "app" || env["CI_PIPELINE_SOURCE"] != "push" {
254
261
t.Fatalf("%v", env)
255
262
}
@@ -250,6 +250,13 @@ func TestMaskAndVariables(t *testing.T) {250
if env["CI_COMMIT_TAG"] != "v1.2.0" || env["CI_COMMIT_BRANCH"] != "" || env["CI_COMMIT_SHORT_SHA"] != "abcdef12" {250
if env["CI_COMMIT_TAG"] != "v1.2.0" || env["CI_COMMIT_BRANCH"] != "" || env["CI_COMMIT_SHORT_SHA"] != "abcdef12" {251
t.Fatalf("%v", env)251
t.Fatalf("%v", env)252
}252
}253
if _, ok := env["CI_COMMIT_TIMESTAMP"]; ok {254
t.Fatal("lege committer-tijd hoort geen variabele te zetten")255
}256
stamped := Variables(Ref{SHA: "abcdef1234567890", FullRef: "refs/heads/master", Timestamp: "2026-10-22T22:32:33+00:00"})257
if stamped["CI_COMMIT_TIMESTAMP"] != "2026-10-22T22:32:33+00:00" {258
t.Fatalf("timestamp: %q", stamped["CI_COMMIT_TIMESTAMP"])259
}253
if env["CI_DEFAULT_BRANCH"] != "master" || env["CI_PROJECT_NAME"] != "app" || env["CI_PIPELINE_SOURCE"] != "push" {260
if env["CI_DEFAULT_BRANCH"] != "master" || env["CI_PROJECT_NAME"] != "app" || env["CI_PIPELINE_SOURCE"] != "push" {254
t.Fatalf("%v", env)261
t.Fatalf("%v", env)255
}262
}@@ -150,6 +150,7 @@ func Build(lang i18n.Lang, presets []images.Preset) Doc {
150
150
variable("CI_COMMIT_REF_NAME", "both"),
151
151
variable("CI_COMMIT_REF_SLUG", "both"),
152
152
variable("CI_COMMIT_TITLE", "both"),
153
variable("CI_COMMIT_TIMESTAMP", "both"),
153
154
variable("CI_COMMIT_BRANCH", "both"),
154
155
variable("CI_COMMIT_TAG", "both"),
155
156
variable("CI_DEFAULT_BRANCH", "both"),
@@ -150,6 +150,7 @@ func Build(lang i18n.Lang, presets []images.Preset) Doc {150
variable("CI_COMMIT_REF_NAME", "both"),150
variable("CI_COMMIT_REF_NAME", "both"),151
variable("CI_COMMIT_REF_SLUG", "both"),151
variable("CI_COMMIT_REF_SLUG", "both"),152
variable("CI_COMMIT_TITLE", "both"),152
variable("CI_COMMIT_TITLE", "both"),153
variable("CI_COMMIT_TIMESTAMP", "both"),153
variable("CI_COMMIT_BRANCH", "both"),154
variable("CI_COMMIT_BRANCH", "both"),154
variable("CI_COMMIT_TAG", "both"),155
variable("CI_COMMIT_TAG", "both"),155
variable("CI_DEFAULT_BRANCH", "both"),156
variable("CI_DEFAULT_BRANCH", "both"),@@ -0,0 +1,24 @@
1
package gitrepo
2
3
import (
4
"context"
5
"fmt"
6
"strings"
7
)
8
9
// CommitterTimestamp is de committer-tijd van sha in ISO 8601 (%cI).
10
// Dat is dezelfde tijd als CI_COMMIT_TIMESTAMP.
11
func CommitterTimestamp(ctx context.Context, gitBin, dir, sha string) (string, error) {
12
if sha == "" {
13
return "", fmt.Errorf("sha ontbreekt")
14
}
15
out, err := run(ctx, gitBin, nil, "-C", dir, "show", "-s", "--format=%cI", sha)
16
if err != nil {
17
return "", err
18
}
19
stamp := strings.TrimSpace(out)
20
if stamp == "" {
21
return "", fmt.Errorf("geen committer-tijd")
22
}
23
return stamp, nil
24
}
@@ -0,0 +1,24 @@1
package gitrepo2
3
import (4
"context"5
"fmt"6
"strings"7
)8
9
// CommitterTimestamp is de committer-tijd van sha in ISO 8601 (%cI).10
// Dat is dezelfde tijd als CI_COMMIT_TIMESTAMP.11
func CommitterTimestamp(ctx context.Context, gitBin, dir, sha string) (string, error) {12
if sha == "" {13
return "", fmt.Errorf("sha ontbreekt")14
}15
out, err := run(ctx, gitBin, nil, "-C", dir, "show", "-s", "--format=%cI", sha)16
if err != nil {17
return "", err18
}19
stamp := strings.TrimSpace(out)20
if stamp == "" {21
return "", fmt.Errorf("geen committer-tijd")22
}23
return stamp, nil24
}@@ -0,0 +1,56 @@
1
package gitrepo
2
3
import (
4
"context"
5
"os"
6
"os/exec"
7
"path/filepath"
8
"strings"
9
"testing"
10
"time"
11
)
12
13
func TestCommitterTimestamp(t *testing.T) {
14
if _, err := exec.LookPath("git"); err != nil {
15
t.Skip("git ontbreekt")
16
}
17
dir := t.TempDir()
18
git := func(args ...string) {
19
t.Helper()
20
cmd := exec.Command("git", append([]string{"-C", dir}, args...)...)
21
cmd.Env = append(os.Environ(),
22
"GIT_AUTHOR_NAME=tim", "GIT_AUTHOR_EMAIL=tim@example.com",
23
"GIT_COMMITTER_NAME=tim", "GIT_COMMITTER_EMAIL=tim@example.com",
24
"GIT_AUTHOR_DATE=2026-10-22T23:32:33+01:00",
25
"GIT_COMMITTER_DATE=2026-10-22T23:32:33+01:00",
26
)
27
if out, err := cmd.CombinedOutput(); err != nil {
28
t.Fatalf("git %v: %v\n%s", args, err, out)
29
}
30
}
31
git("init", "-b", "master")
32
git("config", "commit.gpgsign", "false")
33
if err := os.WriteFile(filepath.Join(dir, "a.txt"), []byte("a\n"), 0o644); err != nil {
34
t.Fatal(err)
35
}
36
git("add", "a.txt")
37
git("commit", "-m", "stamp")
38
shaOut, err := exec.Command("git", "-C", dir, "rev-parse", "HEAD").Output()
39
if err != nil {
40
t.Fatal(err)
41
}
42
got, err := CommitterTimestamp(context.Background(), "git", dir, strings.TrimSpace(string(shaOut)))
43
if err != nil {
44
t.Fatal(err)
45
}
46
parsed, err := time.Parse(time.RFC3339, got)
47
if err != nil {
48
t.Fatalf("geen ISO 8601: %q", got)
49
}
50
if parsed.UTC().Format("20060102150405") != "20261022223233" {
51
t.Fatalf("UTC %s uit %s", parsed.UTC().Format(time.RFC3339), got)
52
}
53
if _, err := CommitterTimestamp(context.Background(), "git", dir, ""); err == nil {
54
t.Fatal("lege sha hoort te falen")
55
}
56
}
@@ -0,0 +1,56 @@1
package gitrepo2
3
import (4
"context"5
"os"6
"os/exec"7
"path/filepath"8
"strings"9
"testing"10
"time"11
)12
13
func TestCommitterTimestamp(t *testing.T) {14
if _, err := exec.LookPath("git"); err != nil {15
t.Skip("git ontbreekt")16
}17
dir := t.TempDir()18
git := func(args ...string) {19
t.Helper()20
cmd := exec.Command("git", append([]string{"-C", dir}, args...)...)21
cmd.Env = append(os.Environ(),22
"GIT_AUTHOR_NAME=tim", "GIT_AUTHOR_EMAIL=tim@example.com",23
"GIT_COMMITTER_NAME=tim", "GIT_COMMITTER_EMAIL=tim@example.com",24
"GIT_AUTHOR_DATE=2026-10-22T23:32:33+01:00",25
"GIT_COMMITTER_DATE=2026-10-22T23:32:33+01:00",26
)27
if out, err := cmd.CombinedOutput(); err != nil {28
t.Fatalf("git %v: %v\n%s", args, err, out)29
}30
}31
git("init", "-b", "master")32
git("config", "commit.gpgsign", "false")33
if err := os.WriteFile(filepath.Join(dir, "a.txt"), []byte("a\n"), 0o644); err != nil {34
t.Fatal(err)35
}36
git("add", "a.txt")37
git("commit", "-m", "stamp")38
shaOut, err := exec.Command("git", "-C", dir, "rev-parse", "HEAD").Output()39
if err != nil {40
t.Fatal(err)41
}42
got, err := CommitterTimestamp(context.Background(), "git", dir, strings.TrimSpace(string(shaOut)))43
if err != nil {44
t.Fatal(err)45
}46
parsed, err := time.Parse(time.RFC3339, got)47
if err != nil {48
t.Fatalf("geen ISO 8601: %q", got)49
}50
if parsed.UTC().Format("20060102150405") != "20261022223233" {51
t.Fatalf("UTC %s uit %s", parsed.UTC().Format(time.RFC3339), got)52
}53
if _, err := CommitterTimestamp(context.Background(), "git", dir, ""); err == nil {54
t.Fatal("lege sha hoort te falen")55
}56
}@@ -83,6 +83,7 @@ var infoEN = map[string]string{
83
83
"info.var.CI_COMMIT_REF_NAME": "Branch or tag name.",
84
84
"info.var.CI_COMMIT_REF_SLUG": "Ref name made safe for a URL.",
85
85
"info.var.CI_COMMIT_TITLE": "Commit subject.",
86
"info.var.CI_COMMIT_TIMESTAMP": "Committer time in ISO 8601.",
86
87
"info.var.CI_COMMIT_BRANCH": "Branch name. Empty on a tag.",
87
88
"info.var.CI_COMMIT_TAG": "Tag name. Empty on a branch.",
88
89
"info.var.CI_DEFAULT_BRANCH": "Default branch of the repository.",
@@ -196,6 +197,7 @@ var infoNL = map[string]string{
196
197
"info.var.CI_COMMIT_REF_NAME": "Naam van de tak of de tag.",
197
198
"info.var.CI_COMMIT_REF_SLUG": "Ref-naam die veilig is in een URL.",
198
199
"info.var.CI_COMMIT_TITLE": "Onderwerp van de commit.",
200
"info.var.CI_COMMIT_TIMESTAMP": "Committer-tijd in ISO 8601.",
199
201
"info.var.CI_COMMIT_BRANCH": "Taknaam. Leeg op een tag.",
200
202
"info.var.CI_COMMIT_TAG": "Tagnaam. Leeg op een tak.",
201
203
"info.var.CI_DEFAULT_BRANCH": "Standaardtak van de repository.",
@@ -309,6 +311,7 @@ var infoDE = map[string]string{
309
311
"info.var.CI_COMMIT_REF_NAME": "Name des Branches oder des Tags.",
310
312
"info.var.CI_COMMIT_REF_SLUG": "Ref-Name, der in einer URL sicher ist.",
311
313
"info.var.CI_COMMIT_TITLE": "Betreff des Commits.",
314
"info.var.CI_COMMIT_TIMESTAMP": "Committer-Zeit in ISO 8601.",
312
315
"info.var.CI_COMMIT_BRANCH": "Branchname. Leer bei einem Tag.",
313
316
"info.var.CI_COMMIT_TAG": "Tagname. Leer bei einem Branch.",
314
317
"info.var.CI_DEFAULT_BRANCH": "Standardbranch des Repositorys.",
@@ -422,6 +425,7 @@ var infoFR = map[string]string{
422
425
"info.var.CI_COMMIT_REF_NAME": "Nom de la branche ou du tag.",
423
426
"info.var.CI_COMMIT_REF_SLUG": "Nom de réf sûr dans une URL.",
424
427
"info.var.CI_COMMIT_TITLE": "Sujet du commit.",
428
"info.var.CI_COMMIT_TIMESTAMP": "Heure du committer au format ISO 8601.",
425
429
"info.var.CI_COMMIT_BRANCH": "Nom de branche. Vide sur un tag.",
426
430
"info.var.CI_COMMIT_TAG": "Nom du tag. Vide sur une branche.",
427
431
"info.var.CI_DEFAULT_BRANCH": "Branche par défaut du dépôt.",
@@ -83,6 +83,7 @@ var infoEN = map[string]string{83
"info.var.CI_COMMIT_REF_NAME": "Branch or tag name.",83
"info.var.CI_COMMIT_REF_NAME": "Branch or tag name.",84
"info.var.CI_COMMIT_REF_SLUG": "Ref name made safe for a URL.",84
"info.var.CI_COMMIT_REF_SLUG": "Ref name made safe for a URL.",85
"info.var.CI_COMMIT_TITLE": "Commit subject.",85
"info.var.CI_COMMIT_TITLE": "Commit subject.",86
"info.var.CI_COMMIT_TIMESTAMP": "Committer time in ISO 8601.",86
"info.var.CI_COMMIT_BRANCH": "Branch name. Empty on a tag.",87
"info.var.CI_COMMIT_BRANCH": "Branch name. Empty on a tag.",87
"info.var.CI_COMMIT_TAG": "Tag name. Empty on a branch.",88
"info.var.CI_COMMIT_TAG": "Tag name. Empty on a branch.",88
"info.var.CI_DEFAULT_BRANCH": "Default branch of the repository.",89
"info.var.CI_DEFAULT_BRANCH": "Default branch of the repository.",@@ -196,6 +197,7 @@ var infoNL = map[string]string{196
"info.var.CI_COMMIT_REF_NAME": "Naam van de tak of de tag.",197
"info.var.CI_COMMIT_REF_NAME": "Naam van de tak of de tag.",197
"info.var.CI_COMMIT_REF_SLUG": "Ref-naam die veilig is in een URL.",198
"info.var.CI_COMMIT_REF_SLUG": "Ref-naam die veilig is in een URL.",198
"info.var.CI_COMMIT_TITLE": "Onderwerp van de commit.",199
"info.var.CI_COMMIT_TITLE": "Onderwerp van de commit.",200
"info.var.CI_COMMIT_TIMESTAMP": "Committer-tijd in ISO 8601.",199
"info.var.CI_COMMIT_BRANCH": "Taknaam. Leeg op een tag.",201
"info.var.CI_COMMIT_BRANCH": "Taknaam. Leeg op een tag.",200
"info.var.CI_COMMIT_TAG": "Tagnaam. Leeg op een tak.",202
"info.var.CI_COMMIT_TAG": "Tagnaam. Leeg op een tak.",201
"info.var.CI_DEFAULT_BRANCH": "Standaardtak van de repository.",203
"info.var.CI_DEFAULT_BRANCH": "Standaardtak van de repository.",@@ -309,6 +311,7 @@ var infoDE = map[string]string{309
"info.var.CI_COMMIT_REF_NAME": "Name des Branches oder des Tags.",311
"info.var.CI_COMMIT_REF_NAME": "Name des Branches oder des Tags.",310
"info.var.CI_COMMIT_REF_SLUG": "Ref-Name, der in einer URL sicher ist.",312
"info.var.CI_COMMIT_REF_SLUG": "Ref-Name, der in einer URL sicher ist.",311
"info.var.CI_COMMIT_TITLE": "Betreff des Commits.",313
"info.var.CI_COMMIT_TITLE": "Betreff des Commits.",314
"info.var.CI_COMMIT_TIMESTAMP": "Committer-Zeit in ISO 8601.",312
"info.var.CI_COMMIT_BRANCH": "Branchname. Leer bei einem Tag.",315
"info.var.CI_COMMIT_BRANCH": "Branchname. Leer bei einem Tag.",313
"info.var.CI_COMMIT_TAG": "Tagname. Leer bei einem Branch.",316
"info.var.CI_COMMIT_TAG": "Tagname. Leer bei einem Branch.",314
"info.var.CI_DEFAULT_BRANCH": "Standardbranch des Repositorys.",317
"info.var.CI_DEFAULT_BRANCH": "Standardbranch des Repositorys.",@@ -422,6 +425,7 @@ var infoFR = map[string]string{422
"info.var.CI_COMMIT_REF_NAME": "Nom de la branche ou du tag.",425
"info.var.CI_COMMIT_REF_NAME": "Nom de la branche ou du tag.",423
"info.var.CI_COMMIT_REF_SLUG": "Nom de réf sûr dans une URL.",426
"info.var.CI_COMMIT_REF_SLUG": "Nom de réf sûr dans une URL.",424
"info.var.CI_COMMIT_TITLE": "Sujet du commit.",427
"info.var.CI_COMMIT_TITLE": "Sujet du commit.",428
"info.var.CI_COMMIT_TIMESTAMP": "Heure du committer au format ISO 8601.",425
"info.var.CI_COMMIT_BRANCH": "Nom de branche. Vide sur un tag.",429
"info.var.CI_COMMIT_BRANCH": "Nom de branche. Vide sur un tag.",426
"info.var.CI_COMMIT_TAG": "Nom du tag. Vide sur une branche.",430
"info.var.CI_COMMIT_TAG": "Nom du tag. Vide sur une branche.",427
"info.var.CI_DEFAULT_BRANCH": "Branche par défaut du dépôt.",431
"info.var.CI_DEFAULT_BRANCH": "Branche par défaut du dépôt.",@@ -746,11 +746,11 @@ func (r *Runner) environment(ctx context.Context, repo store.Repo, p store.Pipel
746
746
env[k] = v
747
747
}
748
748
base := strings.TrimRight(r.BaseURL, "/")
749
dir := gitrepo.Dir(r.storage(), repo.OwnerPath, repo.Name)
749
750
var info *ci.MRInfo
750
751
if p.MRID != 0 {
751
752
if m, merr := r.Store.MergeRequest(ctx, repo.ID, p.MRID); merr == nil {
752
753
target := ""
753
dir := gitrepo.Dir(r.storage(), repo.OwnerPath, repo.Name)
754
754
if out, gerr := exec.CommandContext(ctx, r.GitBin, "-C", dir, "rev-parse", "--verify", "refs/heads/"+m.TargetBranch).Output(); gerr == nil {
755
755
target = strings.TrimSpace(string(out))
756
756
}
@@ -762,8 +762,9 @@ func (r *Runner) environment(ctx context.Context, repo store.Repo, p store.Pipel
762
762
}
763
763
}
764
764
}
765
stamp, _ := gitrepo.CommitterTimestamp(ctx, r.GitBin, dir, p.CommitSHA)
765
766
pre := ci.Variables(ci.Ref{
766
SHA: p.CommitSHA, FullRef: p.Ref, Title: p.CommitTitle,
767
SHA: p.CommitSHA, FullRef: p.Ref, Title: p.CommitTitle, Timestamp: stamp,
767
768
DefaultBranch: repo.DefaultBranch, Source: p.Source,
768
769
ProjectPath: repo.FullPath(), ProjectURL: base + "/" + repo.FullPath(),
769
770
APIURL: base + "/api/v1", PipelineID: p.ID, MR: info,
@@ -746,11 +746,11 @@ func (r *Runner) environment(ctx context.Context, repo store.Repo, p store.Pipel746
env[k] = v746
env[k] = v747
}747
}748
base := strings.TrimRight(r.BaseURL, "/")748
base := strings.TrimRight(r.BaseURL, "/")749
dir := gitrepo.Dir(r.storage(), repo.OwnerPath, repo.Name)749
var info *ci.MRInfo750
var info *ci.MRInfo750
if p.MRID != 0 {751
if p.MRID != 0 {751
if m, merr := r.Store.MergeRequest(ctx, repo.ID, p.MRID); merr == nil {752
if m, merr := r.Store.MergeRequest(ctx, repo.ID, p.MRID); merr == nil {752
target := ""753
target := ""753
dir := gitrepo.Dir(r.storage(), repo.OwnerPath, repo.Name)754
if out, gerr := exec.CommandContext(ctx, r.GitBin, "-C", dir, "rev-parse", "--verify", "refs/heads/"+m.TargetBranch).Output(); gerr == nil {754
if out, gerr := exec.CommandContext(ctx, r.GitBin, "-C", dir, "rev-parse", "--verify", "refs/heads/"+m.TargetBranch).Output(); gerr == nil {755
target = strings.TrimSpace(string(out))755
target = strings.TrimSpace(string(out))756
}756
}@@ -762,8 +762,9 @@ func (r *Runner) environment(ctx context.Context, repo store.Repo, p store.Pipel762
}762
}763
}763
}764
}764
}765
stamp, _ := gitrepo.CommitterTimestamp(ctx, r.GitBin, dir, p.CommitSHA)765
pre := ci.Variables(ci.Ref{766
pre := ci.Variables(ci.Ref{766
SHA: p.CommitSHA, FullRef: p.Ref, Title: p.CommitTitle,767
SHA: p.CommitSHA, FullRef: p.Ref, Title: p.CommitTitle, Timestamp: stamp,767
DefaultBranch: repo.DefaultBranch, Source: p.Source,768
DefaultBranch: repo.DefaultBranch, Source: p.Source,768
ProjectPath: repo.FullPath(), ProjectURL: base + "/" + repo.FullPath(),769
ProjectPath: repo.FullPath(), ProjectURL: base + "/" + repo.FullPath(),769
APIURL: base + "/api/v1", PipelineID: p.ID, MR: info,770
APIURL: base + "/api/v1", PipelineID: p.ID, MR: info,@@ -29,6 +29,8 @@ func TestCISpecPageMatchesAPI(t *testing.T) {
29
29
"bluegit/node",
30
30
"node:22",
31
31
"CI_JOB_TOKEN",
32
"CI_COMMIT_TIMESTAMP",
33
"Committer time in ISO 8601.",
32
34
"workflow",
33
35
"Differences with GitLab",
34
36
`href="/-/info"`,
@@ -70,7 +72,7 @@ func TestCISpecPageMatchesAPI(t *testing.T) {
70
72
t.Fatal(err)
71
73
}
72
74
dutch := read(t, nl)
73
if !strings.Contains(dutch, "Volgorde van de stages") || !strings.Contains(dutch, "bluegit/base") {
75
if !strings.Contains(dutch, "Volgorde van de stages") || !strings.Contains(dutch, "bluegit/base") || !strings.Contains(dutch, "Committer-tijd in ISO 8601.") {
74
76
t.Fatalf("nl: %s", dutch[:400])
75
77
}
76
78
cu, err := http.Get(ts.URL + "/api/v1/ci/spec?lang=cuneiform")
@@ -29,6 +29,8 @@ func TestCISpecPageMatchesAPI(t *testing.T) {29
"bluegit/node",29
"bluegit/node",30
"node:22",30
"node:22",31
"CI_JOB_TOKEN",31
"CI_JOB_TOKEN",32
"CI_COMMIT_TIMESTAMP",33
"Committer time in ISO 8601.",32
"workflow",34
"workflow",33
"Differences with GitLab",35
"Differences with GitLab",34
`href="/-/info"`,36
`href="/-/info"`,@@ -70,7 +72,7 @@ func TestCISpecPageMatchesAPI(t *testing.T) {70
t.Fatal(err)72
t.Fatal(err)71
}73
}72
dutch := read(t, nl)74
dutch := read(t, nl)73
if !strings.Contains(dutch, "Volgorde van de stages") || !strings.Contains(dutch, "bluegit/base") {75
if !strings.Contains(dutch, "Volgorde van de stages") || !strings.Contains(dutch, "bluegit/base") || !strings.Contains(dutch, "Committer-tijd in ISO 8601.") {74
t.Fatalf("nl: %s", dutch[:400])76
t.Fatalf("nl: %s", dutch[:400])75
}77
}76
cu, err := http.Get(ts.URL + "/api/v1/ci/spec?lang=cuneiform")78
cu, err := http.Get(ts.URL + "/api/v1/ci/spec?lang=cuneiform")@@ -33,8 +33,9 @@ func (s *Server) planPipeline(ctx context.Context, repo store.Repo, sha, ref, so
33
33
files := gitLines(ctx, s.Git, dir, "ls-tree", "-r", "--name-only", sha)
34
34
changed := changedFiles(ctx, s.Git, dir, sha, before, files)
35
35
base := strings.TrimRight(s.Cfg.BaseURL, "/")
36
stamp, _ := gitrepo.CommitterTimestamp(ctx, s.Git, dir, sha)
36
37
env := ci.Variables(ci.Ref{
37
SHA: sha, FullRef: ref, Name: name, Kind: kind, Title: title,
38
SHA: sha, FullRef: ref, Name: name, Kind: kind, Title: title, Timestamp: stamp,
38
39
DefaultBranch: repo.DefaultBranch, Source: source, ProjectPath: repo.FullPath(),
39
40
ProjectURL: base + "/" + repo.FullPath(), APIURL: base + "/api/v1", MR: mr,
40
41
})
@@ -33,8 +33,9 @@ func (s *Server) planPipeline(ctx context.Context, repo store.Repo, sha, ref, so33
files := gitLines(ctx, s.Git, dir, "ls-tree", "-r", "--name-only", sha)33
files := gitLines(ctx, s.Git, dir, "ls-tree", "-r", "--name-only", sha)34
changed := changedFiles(ctx, s.Git, dir, sha, before, files)34
changed := changedFiles(ctx, s.Git, dir, sha, before, files)35
base := strings.TrimRight(s.Cfg.BaseURL, "/")35
base := strings.TrimRight(s.Cfg.BaseURL, "/")36
stamp, _ := gitrepo.CommitterTimestamp(ctx, s.Git, dir, sha)36
env := ci.Variables(ci.Ref{37
env := ci.Variables(ci.Ref{37
SHA: sha, FullRef: ref, Name: name, Kind: kind, Title: title,38
SHA: sha, FullRef: ref, Name: name, Kind: kind, Title: title, Timestamp: stamp,38
DefaultBranch: repo.DefaultBranch, Source: source, ProjectPath: repo.FullPath(),39
DefaultBranch: repo.DefaultBranch, Source: source, ProjectPath: repo.FullPath(),39
ProjectURL: base + "/" + repo.FullPath(), APIURL: base + "/api/v1", MR: mr,40
ProjectURL: base + "/" + repo.FullPath(), APIURL: base + "/api/v1", MR: mr,40
})41
})@@ -478,3 +478,62 @@ fi
478
478
479
479
echo hook-ok
480
480
`
481
482
func TestPkgverUsesCommitterTime(t *testing.T) {
483
root := filepath.Join("..")
484
script := filepath.Join(root, "scripts", "publish-aur.sh")
485
out, err := exec.Command("git", "-C", root, "rev-parse", "HEAD").Output()
486
if err != nil {
487
t.Fatal(err)
488
}
489
sha := strings.TrimSpace(string(out))
490
if got := printPkgver(t, script, sha, "2026-10-22T22:32:33Z"); got != "20261022223233" {
491
t.Fatalf("Z: %s", got)
492
}
493
if got := printPkgver(t, script, sha, "2026-10-22T23:32:33+01:00"); got != "20261022223233" {
494
t.Fatalf("offset: %s", got)
495
}
496
if got := printPkgver(t, script, sha, "2026-10-22T00:30:00+02:00"); got != "20261021223000" {
497
t.Fatalf("rollover: %s", got)
498
}
499
500
got := printPkgver(t, script, sha, "")
501
updater := exec.Command("git", "-C", root, "show", "-s", "--date=format-local:%Y%m%d%H%M%S", "--format=%cd", sha)
502
updater.Env = append(os.Environ(), "TZ=UTC")
503
up, err := updater.Output()
504
if err != nil {
505
t.Fatal(err)
506
}
507
if got != strings.TrimSpace(string(up)) {
508
t.Fatalf("pkgver %s wijkt af van de updater %s", got, strings.TrimSpace(string(up)))
509
}
510
now, err := exec.Command("date", "-u", "+%Y%m%d%H%M%S").Output()
511
if err != nil {
512
t.Fatal(err)
513
}
514
if got == strings.TrimSpace(string(now)) && got != strings.TrimSpace(string(up)) {
515
t.Fatal("pkgver volgt de klok van de job")
516
}
517
}
518
519
func printPkgver(t *testing.T, script, sha, stamp string) string {
520
t.Helper()
521
env := make([]string, 0, len(os.Environ()))
522
for _, e := range os.Environ() {
523
if strings.HasPrefix(e, "CI_COMMIT_TIMESTAMP=") || strings.HasPrefix(e, "CI_COMMIT_SHA=") {
524
continue
525
}
526
env = append(env, e)
527
}
528
env = append(env, "CI_COMMIT_SHA="+sha)
529
if stamp != "" {
530
env = append(env, "CI_COMMIT_TIMESTAMP="+stamp)
531
}
532
cmd := exec.Command("bash", script, "--print-pkgver")
533
cmd.Env = env
534
out, err := cmd.CombinedOutput()
535
if err != nil {
536
t.Fatalf("print-pkgver: %v %s", err, out)
537
}
538
return strings.TrimSpace(string(out))
539
}
@@ -478,3 +478,62 @@ fi478
478
479
echo hook-ok479
echo hook-ok480
`480
`481
482
func TestPkgverUsesCommitterTime(t *testing.T) {483
root := filepath.Join("..")484
script := filepath.Join(root, "scripts", "publish-aur.sh")485
out, err := exec.Command("git", "-C", root, "rev-parse", "HEAD").Output()486
if err != nil {487
t.Fatal(err)488
}489
sha := strings.TrimSpace(string(out))490
if got := printPkgver(t, script, sha, "2026-10-22T22:32:33Z"); got != "20261022223233" {491
t.Fatalf("Z: %s", got)492
}493
if got := printPkgver(t, script, sha, "2026-10-22T23:32:33+01:00"); got != "20261022223233" {494
t.Fatalf("offset: %s", got)495
}496
if got := printPkgver(t, script, sha, "2026-10-22T00:30:00+02:00"); got != "20261021223000" {497
t.Fatalf("rollover: %s", got)498
}499
500
got := printPkgver(t, script, sha, "")501
updater := exec.Command("git", "-C", root, "show", "-s", "--date=format-local:%Y%m%d%H%M%S", "--format=%cd", sha)502
updater.Env = append(os.Environ(), "TZ=UTC")503
up, err := updater.Output()504
if err != nil {505
t.Fatal(err)506
}507
if got != strings.TrimSpace(string(up)) {508
t.Fatalf("pkgver %s wijkt af van de updater %s", got, strings.TrimSpace(string(up)))509
}510
now, err := exec.Command("date", "-u", "+%Y%m%d%H%M%S").Output()511
if err != nil {512
t.Fatal(err)513
}514
if got == strings.TrimSpace(string(now)) && got != strings.TrimSpace(string(up)) {515
t.Fatal("pkgver volgt de klok van de job")516
}517
}518
519
func printPkgver(t *testing.T, script, sha, stamp string) string {520
t.Helper()521
env := make([]string, 0, len(os.Environ()))522
for _, e := range os.Environ() {523
if strings.HasPrefix(e, "CI_COMMIT_TIMESTAMP=") || strings.HasPrefix(e, "CI_COMMIT_SHA=") {524
continue525
}526
env = append(env, e)527
}528
env = append(env, "CI_COMMIT_SHA="+sha)529
if stamp != "" {530
env = append(env, "CI_COMMIT_TIMESTAMP="+stamp)531
}532
cmd := exec.Command("bash", script, "--print-pkgver")533
cmd.Env = env534
out, err := cmd.CombinedOutput()535
if err != nil {536
t.Fatalf("print-pkgver: %v %s", err, out)537
}538
return strings.TrimSpace(string(out))539
}@@ -7,22 +7,80 @@ ROOT="$(cd "$(dirname "$0")/.." && pwd)"
7
7
# shellcheck source=aur-common.sh
8
8
source "$(dirname "$0")/aur-common.sh"
9
9
10
# pkgver_of_commit is YYYYMMDDHHMMSS in UTC, from the committer time.
11
# CI_COMMIT_TIMESTAMP is ISO 8601. Without it, git show -s --format=%cI
12
# is the same instant the self-updater uses. The job clock is not a version.
13
# BusyBox date does not parse the Z or an offset, so the offset is applied here.
14
pkgver_of_commit() {
15
local root="$1"
16
local commit="${2:-}"
17
if [[ -z "$commit" ]]; then
18
commit="$(git -C "$root" rev-parse HEAD)"
19
fi
20
[[ "$commit" =~ ^[0-9a-f]{40}$ ]] || { echo "CI_COMMIT_SHA or HEAD is not a full sha" >&2; return 1; }
21
local stamp version
22
if [[ -n "${CI_COMMIT_TIMESTAMP:-}" ]]; then
23
stamp="$CI_COMMIT_TIMESTAMP"
24
else
25
stamp="$(git -C "$root" show -s --format=%cI "$commit")"
26
fi
27
version="$(utc_digits "$stamp")" || return 1
28
[[ "$version" =~ ^[0-9]{14}$ ]] || { echo "pkgver is not a timestamp: ${version:-empty} from ${stamp:-empty}" >&2; return 1; }
29
printf '%s\n' "$version"
30
}
31
32
# utc_digits turns ISO 8601 into YYYYMMDDHHMMSS in UTC.
33
# Accepted forms: 2026-10-22T23:32:33Z, 2026-10-22T23:32:33+01:00, 2026-10-22T23:32:33+0100.
34
utc_digits() {
35
local stamp="$1" core off sign hh mm epoch adj
36
if [[ "$stamp" == *Z ]]; then
37
core="${stamp%Z}"
38
off="+00:00"
39
elif [[ "$stamp" =~ ^(.+)([+-][0-9]{2}:[0-9]{2})$ ]]; then
40
core="${BASH_REMATCH[1]}"
41
off="${BASH_REMATCH[2]}"
42
elif [[ "$stamp" =~ ^(.+)([+-][0-9]{4})$ ]]; then
43
core="${BASH_REMATCH[1]}"
44
off="${BASH_REMATCH[2]:0:3}:${BASH_REMATCH[2]:3:2}"
45
else
46
core="$stamp"
47
off="+00:00"
48
fi
49
core="${core%%.*}"
50
core="${core/T/ }"
51
[[ "$core" =~ ^[0-9]{4}-[0-9]{2}-[0-9]{2}\ [0-9]{2}:[0-9]{2}:[0-9]{2}$ ]] || {
52
echo "pkgver stamp is not ISO 8601: $stamp" >&2
53
return 1
54
}
55
sign="${off:0:1}"
56
hh="${off:1:2}"
57
mm="${off:4:2}"
58
epoch="$(TZ=UTC date -u -d "$core" +%s)" || return 1
59
adj=$((10#$hh * 3600 + 10#$mm * 60))
60
if [[ "$sign" == "+" ]]; then
61
epoch=$((epoch - adj))
62
else
63
epoch=$((epoch + adj))
64
fi
65
TZ=UTC date -u -d "@$epoch" +%Y%m%d%H%M%S
66
}
67
10
68
if [[ "${1:-}" == "--rewrite-only" ]]; then
11
69
rewrite_pkgbuild "$2" "$3" "$4" "$5"
12
70
exit 0
13
71
fi
14
72
73
if [[ "${1:-}" == "--print-pkgver" ]]; then
74
pkgver_of_commit "$ROOT" "${CI_COMMIT_SHA:-}"
75
exit
76
fi
77
15
78
for cmd in git sed sha256sum curl; do
16
79
command -v "$cmd" >/dev/null || { echo "Missing command: $cmd" >&2; exit 1; }
17
80
done
18
81
19
82
COMMIT="${CI_COMMIT_SHA:-$(git -C "$ROOT" rev-parse HEAD)}"
20
[[ "$COMMIT" =~ ^[0-9a-f]{40}$ ]] || { echo "CI_COMMIT_SHA or HEAD is not a full sha" >&2; exit 1; }
21
if [[ -n "${CI_COMMIT_TIMESTAMP:-}" ]]; then
22
VERSION="$(date -u -d "$CI_COMMIT_TIMESTAMP" +%Y%m%d%H%M%S)"
23
else
24
VERSION="$(date -u +%Y%m%d%H%M%S)"
25
fi
83
VERSION="$(pkgver_of_commit "$ROOT" "$COMMIT")"
26
84
27
85
TMPDIR="${TMPDIR:-/tmp}"
28
86
WORKDIR="$(mktemp -d "$TMPDIR/bluegit-aur-XXXXXX")"
@@ -7,22 +7,80 @@ ROOT="$(cd "$(dirname "$0")/.." && pwd)"7
# shellcheck source=aur-common.sh7
# shellcheck source=aur-common.sh8
source "$(dirname "$0")/aur-common.sh"8
source "$(dirname "$0")/aur-common.sh"9
9
10
# pkgver_of_commit is YYYYMMDDHHMMSS in UTC, from the committer time.11
# CI_COMMIT_TIMESTAMP is ISO 8601. Without it, git show -s --format=%cI12
# is the same instant the self-updater uses. The job clock is not a version.13
# BusyBox date does not parse the Z or an offset, so the offset is applied here.14
pkgver_of_commit() {15
local root="$1"16
local commit="${2:-}"17
if [[ -z "$commit" ]]; then18
commit="$(git -C "$root" rev-parse HEAD)"19
fi20
[[ "$commit" =~ ^[0-9a-f]{40}$ ]] || { echo "CI_COMMIT_SHA or HEAD is not a full sha" >&2; return 1; }21
local stamp version22
if [[ -n "${CI_COMMIT_TIMESTAMP:-}" ]]; then23
stamp="$CI_COMMIT_TIMESTAMP"24
else25
stamp="$(git -C "$root" show -s --format=%cI "$commit")"26
fi27
version="$(utc_digits "$stamp")" || return 128
[[ "$version" =~ ^[0-9]{14}$ ]] || { echo "pkgver is not a timestamp: ${version:-empty} from ${stamp:-empty}" >&2; return 1; }29
printf '%s\n' "$version"30
}31
32
# utc_digits turns ISO 8601 into YYYYMMDDHHMMSS in UTC.33
# Accepted forms: 2026-10-22T23:32:33Z, 2026-10-22T23:32:33+01:00, 2026-10-22T23:32:33+0100.34
utc_digits() {35
local stamp="$1" core off sign hh mm epoch adj36
if [[ "$stamp" == *Z ]]; then37
core="${stamp%Z}"38
off="+00:00"39
elif [[ "$stamp" =~ ^(.+)([+-][0-9]{2}:[0-9]{2})$ ]]; then40
core="${BASH_REMATCH[1]}"41
off="${BASH_REMATCH[2]}"42
elif [[ "$stamp" =~ ^(.+)([+-][0-9]{4})$ ]]; then43
core="${BASH_REMATCH[1]}"44
off="${BASH_REMATCH[2]:0:3}:${BASH_REMATCH[2]:3:2}"45
else46
core="$stamp"47
off="+00:00"48
fi49
core="${core%%.*}"50
core="${core/T/ }"51
[[ "$core" =~ ^[0-9]{4}-[0-9]{2}-[0-9]{2}\ [0-9]{2}:[0-9]{2}:[0-9]{2}$ ]] || {52
echo "pkgver stamp is not ISO 8601: $stamp" >&253
return 154
}55
sign="${off:0:1}"56
hh="${off:1:2}"57
mm="${off:4:2}"58
epoch="$(TZ=UTC date -u -d "$core" +%s)" || return 159
adj=$((10#$hh * 3600 + 10#$mm * 60))60
if [[ "$sign" == "+" ]]; then61
epoch=$((epoch - adj))62
else63
epoch=$((epoch + adj))64
fi65
TZ=UTC date -u -d "@$epoch" +%Y%m%d%H%M%S66
}67
10
if [[ "${1:-}" == "--rewrite-only" ]]; then68
if [[ "${1:-}" == "--rewrite-only" ]]; then11
rewrite_pkgbuild "$2" "$3" "$4" "$5"69
rewrite_pkgbuild "$2" "$3" "$4" "$5"12
exit 070
exit 013
fi71
fi14
72
73
if [[ "${1:-}" == "--print-pkgver" ]]; then74
pkgver_of_commit "$ROOT" "${CI_COMMIT_SHA:-}"75
exit76
fi77
15
for cmd in git sed sha256sum curl; do78
for cmd in git sed sha256sum curl; do16
command -v "$cmd" >/dev/null || { echo "Missing command: $cmd" >&2; exit 1; }79
command -v "$cmd" >/dev/null || { echo "Missing command: $cmd" >&2; exit 1; }17
done80
done18
81
19
COMMIT="${CI_COMMIT_SHA:-$(git -C "$ROOT" rev-parse HEAD)}"82
COMMIT="${CI_COMMIT_SHA:-$(git -C "$ROOT" rev-parse HEAD)}"20
[[ "$COMMIT" =~ ^[0-9a-f]{40}$ ]] || { echo "CI_COMMIT_SHA or HEAD is not a full sha" >&2; exit 1; }83
VERSION="$(pkgver_of_commit "$ROOT" "$COMMIT")"21
if [[ -n "${CI_COMMIT_TIMESTAMP:-}" ]]; then22
VERSION="$(date -u -d "$CI_COMMIT_TIMESTAMP" +%Y%m%d%H%M%S)"23
else24
VERSION="$(date -u +%Y%m%d%H%M%S)"25
fi26
84
27
TMPDIR="${TMPDIR:-/tmp}"85
TMPDIR="${TMPDIR:-/tmp}"28
WORKDIR="$(mktemp -d "$TMPDIR/bluegit-aur-XXXXXX")"86
WORKDIR="$(mktemp -d "$TMPDIR/bluegit-aur-XXXXXX")"