Adding VersionStream for gitlab-pages-18.6 #72532
Merged
Octo STS / staging-autofix
completed
Nov 26, 2025 in 0s
Merge report generated
Merge Report
First Commit SHA: 98013ba281426e7adfcc9cc974e016395666d8a6
Embeddings Stored
Stored 1 embedding(s) in the vector index:
- Datapoint ID:
00650213-37ae-41d7-8cd4-91bcc9b449e3
Error: CVEs Found (fail-any mode) - Build failed due to detected vulnerabilities.
Patch
From 26a44913d372b5c9a8eefa1db4dbf1ae9909a544 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <[email protected]>
Date: Thu, 20 Nov 2025 15:39:18 -0500
Subject: [PATCH 1/2] gitlab-pages-18.6: bump x/crypto to 0.45.0
CVE-2025-47914 GHSA-f6x5-jh6r-wrfv
CVE-2025-58181 GHSA-j5w8-q4qc-rx2x
---
gitlab-pages-18.6.yaml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/gitlab-pages-18.6.yaml b/gitlab-pages-18.6.yaml
index 97a6b08c640..a2819197e9f 100644
--- a/gitlab-pages-18.6.yaml
+++ b/gitlab-pages-18.6.yaml
@@ -28,6 +28,11 @@ pipeline:
tag: v${{package.version}}
expected-commit: 2c0f7c11200f3d701cc4fe6fbb4be0efa5587ba5
+ - uses: go/bump
+ with:
+ deps: |-
+ golang.org/x/[email protected]
+
- uses: go/build
with:
packages: .
From df1b9b64d1f4acf3bb4e7fde22193a9b73ee09ef Mon Sep 17 00:00:00 2001
From: David Negreira <[email protected]>
Date: Wed, 26 Nov 2025 10:19:26 +0100
Subject: [PATCH 2/2] gitlab-pages-18.6: modify ldflags to report proper go
module version
Signed-off-by: David Negreira <[email protected]>
---
gitlab-pages-18.6.yaml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gitlab-pages-18.6.yaml b/gitlab-pages-18.6.yaml
index a2819197e9f..986f20789cf 100644
--- a/gitlab-pages-18.6.yaml
+++ b/gitlab-pages-18.6.yaml
@@ -38,7 +38,12 @@ pipeline:
packages: .
output: gitlab-pages
tags: continuous_profiler_stackdriver
- ldflags: "-w -X main.VERSION=${{package.version}} -X main.REVISION=${{package.version}}"
+ ldflags: |
+ -X main.VERSION=${{package.version}}
+ -X gitlab.com/gitlab-org/gitlab-pages/pkg/version.buildVersion=${{package.version}}
+ -X gitlab.com/gitlab-org/gitlab-pages/pkg/version.buildGitRevision=$(git rev-parse --short HEAD)
+ -X gitlab.com/gitlab-org/gitlab-pages/pkg/version.buildTag=$(git describe --tags --always)
+ extra-args: "-buildvcs=false"
- runs: |
mkdir -p ${{targets.contextdir}}/srv/gitlab-pages
Loading