From 56766017acfde18aab452a767cbcb142bfd7d437 Mon Sep 17 00:00:00 2001
From: "octo-sts[bot]" <157150467+octo-sts@users.noreply.github.com>
Date: Sat, 20 Dec 2025 07:32:26 +0000
Subject: [PATCH 1/2] gitlab-pages-18.7: updated

---
 gitlab-pages-18.7.yaml | 57 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 gitlab-pages-18.7.yaml

diff --git a/gitlab-pages-18.7.yaml b/gitlab-pages-18.7.yaml
new file mode 100644
index 00000000000..747f07dfb87
--- /dev/null
+++ b/gitlab-pages-18.7.yaml
@@ -0,0 +1,57 @@
+package:
+  name: gitlab-pages-18.7
+  version: "18.7.0"
+  epoch: 0 # CVE-2025-61729
+  description: GitLab Pages daemon used to serve static websites for GitLab users.
+  copyright:
+    - license: MIT
+  dependencies:
+    provides:
+      - gitlab-pages=${{package.full-version}}
+      # REMOVE_POST_USRMERGE - https://github.com/orgs/wolfi-dev/discussions/40270
+      - gitlab-pages-compat-${{vars.major-minor-version}}
+      - gitlab-pages-compat=${{package.full-version}}
+    runtime:
+      - merged-bin
+      - wolfi-baselayout
+
+var-transforms:
+  - from: ${{package.version}}
+    match: ^(\d+\.\d+)\.\d+$
+    replace: "$1"
+    to: major-minor-version
+
+pipeline:
+  - uses: git-checkout
+    with:
+      repository: https://gitlab.com/gitlab-org/gitlab-pages.git
+      tag: v${{package.version}}
+      expected-commit: 29bfbcaa34a46676b10ff37f1fe09aad49b84833
+
+  - uses: go/build
+    with:
+      packages: .
+      output: gitlab-pages
+      tags: continuous_profiler_stackdriver
+      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
+      mkdir -p ${{targets.contextdir}}/var/log/gitlab
+
+update:
+  enabled: true
+  git:
+    strip-prefix: v
+    tag-filter-prefix: v18.7
+
+test:
+  pipeline:
+    # AUTOGENERATED
+    - runs: |
+        gitlab-pages --version

From 2176d436455020edfbf308b9aab0492dcfbd5b47 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel.watkins@chainguard.dev>
Date: Tue, 23 Dec 2025 12:01:06 -0500
Subject: [PATCH 2/2] gitlab-pages-18.7: update expected-commit

---
 gitlab-pages-18.7.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitlab-pages-18.7.yaml b/gitlab-pages-18.7.yaml
index 747f07dfb87..ecdc38f51ff 100644
--- a/gitlab-pages-18.7.yaml
+++ b/gitlab-pages-18.7.yaml
@@ -26,7 +26,7 @@ pipeline:
     with:
       repository: https://gitlab.com/gitlab-org/gitlab-pages.git
       tag: v${{package.version}}
-      expected-commit: 29bfbcaa34a46676b10ff37f1fe09aad49b84833
+      expected-commit: b6b761b9ef10182fb96e4662cb1c550dd137a462
 
   - uses: go/build
     with: