Fixes

wolfi-dev · Feb 25, 2025 · 2dc5b56 · 2dc5b56
1 parent f60772b
commit 2dc5b56
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 33 deletions.
diff --git a/gitlab-cng-17.8.yaml b/gitlab-cng-17.8.yaml
@@ -40,9 +40,6 @@ package:
     provides:
       - gitlab-cng=${{package.full-version}}
       - gitlab=${{package.full-version}}
-      # REMOVE_POST_USRMERGE - https://github.com/orgs/wolfi-dev/discussions/40270
-      - gitlab-container-registry-compat-${{vars.major-minor-version}}
-      - gitlab-container-registry-compat=${{package.full-version}}
 
 environment:
   contents:
@@ -216,6 +213,9 @@ subpackages:
     dependencies:
       provides:
         - gitlab-container-registry=${{package.full-version}}
+        # REMOVE_POST_USRMERGE - https://github.com/orgs/wolfi-dev/discussions/40270
+        - gitlab-container-registry-compat-${{vars.major-minor-version}}
+        - gitlab-container-registry-compat=${{package.full-version}}
     pipeline:
       - uses: git-checkout
         with:

diff --git a/gitlab-cng-17.9.yaml b/gitlab-cng-17.9.yaml
@@ -213,6 +213,9 @@ subpackages:
     dependencies:
       provides:
         - gitlab-container-registry=${{package.full-version}}
+        # REMOVE_POST_USRMERGE - https://github.com/orgs/wolfi-dev/discussions/40270
+        - gitlab-container-registry-compat-${{vars.major-minor-version}}
+        - gitlab-container-registry-compat=${{package.full-version}}
     pipeline:
       - uses: git-checkout
         with:
@@ -295,16 +298,6 @@ subpackages:
             # Stop the registry
             kill $PID
 
-  - name: gitlab-container-registry-compat-${{vars.major-minor-version}}
-    dependencies:
-      provides:
-        - gitlab-container-registry-compat=${{package.full-version}}
-    pipeline:
-      - runs: |
-          # https://gitlab.com/gitlab-org/build/CNG/-/blob/master/gitlab-container-registry/scripts/process-wrapper?ref_type=heads#L3
-          mkdir -p "${{targets.contextdir}}"/bin
-          ln -sf /usr/bin/registry "${{targets.contextdir}}"/bin/registry
-
   - name: gitlab-elasticsearch-indexer-${{vars.major-minor-version}}
     description: Elasticsearch indexer for GitLab EE, written in Go
     dependencies:

diff --git a/gitlab-pages-17.9.yaml b/gitlab-pages-17.9.yaml
@@ -8,6 +8,9 @@ package:
   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}}
 
 var-transforms:
   - from: ${{package.version}}
@@ -33,26 +36,6 @@ pipeline:
       mkdir -p ${{targets.contextdir}}/srv/gitlab-pages
       mkdir -p ${{targets.contextdir}}/var/log/gitlab
 
-subpackages:
-  - name: gitlab-pages-compat-${{vars.major-minor-version}}
-    description: Links GitLab pages to bin directory
-    dependencies:
-      provides:
-        - gitlab-pages-compat=${{package.full-version}}
-    pipeline:
-      - runs: |
-          mkdir -p ${{targets.contextdir}}/bin
-          ln -sf /usr/bin/gitlab-pages ${{targets.contextdir}}/bin/gitlab-pages
-    test:
-      environment:
-        contents:
-          packages:
-            - gitlab-pages-${{vars.major-minor-version}}
-      pipeline:
-        - runs: |
-            test -x /bin/gitlab-pages
-            /bin/gitlab-pages --version
-
 update:
   enabled: true
   git: