Merge pull request #40521 from dannf/libmamba-semver

libmamba: Use semver tags

libmamba.yaml

@@ -1,7 +1,7 @@
 package:
   name: libmamba
-  version: 2024.10.02
-  epoch: 3
+  version: 2.0.5
+  epoch: 0
   description: Cross-Platform Package Manager
   copyright:
     - license: BSD-3-Clause
@@ -57,9 +57,9 @@ environment:
 pipeline:
   - uses: git-checkout
     with:
-      expected-commit: 31b23473e059b47c03b065e5592ea5a7cf77fc9b
+      expected-commit: 4cbb3f7de08b75a5bffd50fd6b4bb79f0291dd42
       repository: https://github.com/mamba-org/mamba
-      tag: ${{package.version}}
+      tag: libmamba-${{package.version}}
 
   - uses: patch
     with:
@@ -165,8 +165,15 @@ subpackages:
 
 update:
   enabled: true
+  ignore-regex-patterns:
+    - .*alpha.*
+    - .*beta.*
+    - .*rc.*
   github:
     identifier: mamba-org/mamba
+    tag-filter-prefix: libmamba-
+    strip-prefix: libmamba-
+    use-tag: true
 
 test:
   environment:

libmamba/support-shared-libs.patch

@@ -1,8 +1,10 @@
+From: https://github.com/wolfi-dev/os/pull/29763#issuecomment-2463427683
+
 diff --git a/libmamba/CMakeLists.txt b/libmamba/CMakeLists.txt
-index 16716339..72dcfd1f 100644
+index 5fe133ce..7e9dcaf6 100644
 --- a/libmamba/CMakeLists.txt
 +++ b/libmamba/CMakeLists.txt
-@@ -445,171 +445,29 @@ macro(libmamba_create_target target_name linkage output_name)
+@@ -453,174 +453,29 @@ macro(libmamba_create_target target_name linkage output_name)
          SPDLOG_FMT_EXTERNAL "SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_${BUILD_LOG_LEVEL}"
      )
 
@@ -100,7 +102,7 @@ index 16716339..72dcfd1f 100644
 -            set(CMAKE_PREFIX_PATH "$ENV{VCPKG_ROOT}/installed/x64-windows-static-md/")
 -
 -            # For Windows we have a vcpkg based build system right now.
--            find_package(LibArchive REQUIRED)
+-            find_package(LibArchive MODULE REQUIRED)
 -            find_package(CURL CONFIG REQUIRED)
 -            find_library(LIBLZMA_LIBRARIES lzma REQUIRED)
 -            find_library(LZ4_LIBRARY NAMES lz4)
@@ -170,6 +172,9 @@ index 16716339..72dcfd1f 100644
 -                solv::libsolvext
 -                solv::cpp
 -        )
+-        # CMake 3.17 provides a LibArchive::LibArchive target that could be used instead of
+-        # LIBRARIES/INCLUDE_DIRS
+-        target_include_directories(${target_name} PRIVATE "${LibArchive_INCLUDE_DIRS}")
 -    endif()
 +    message("   -> Using shared libraries for libmamba dependencies")
 +    find_package(CURL REQUIRED)

withdrawn-packages.txt

@@ -1,3 +1,86 @@
+libmamba-2024.03.25-r0
+libmamba-2024.03.25-r1
+libmamba-2024.03.25-r2
+libmamba-2024.03.25-r3
+libmamba-2024.03.25-r4
+libmamba-2024.03.25-r5
+libmamba-2024.08.31-r0
+libmamba-2024.08.31-r1
+libmamba-2024.09.30-r0
+libmamba-2024.10.02-r0
+libmamba-2024.10.02-r1
+libmamba-2024.10.02-r2
+libmamba-2024.10.02-r3
+libmamba-dev-2024.03.25-r0
+libmamba-dev-2024.03.25-r1
+libmamba-dev-2024.03.25-r2
+libmamba-dev-2024.03.25-r3
+libmamba-dev-2024.03.25-r4
+libmamba-dev-2024.03.25-r5
+libmamba-dev-2024.08.31-r0
+libmamba-dev-2024.08.31-r1
+libmamba-dev-2024.09.30-r0
+libmamba-dev-2024.10.02-r0
+libmamba-dev-2024.10.02-r1
+libmamba-dev-2024.10.02-r2
+libmamba-dev-2024.10.02-r3
+mamba-package-2024.03.25-r1
+mamba-package-2024.03.25-r2
+mamba-package-2024.03.25-r3
+mamba-package-2024.03.25-r4
+mamba-package-2024.03.25-r5
+mamba-package-2024.08.31-r0
+mamba-package-2024.08.31-r1
+mamba-package-2024.09.30-r0
+mamba-package-2024.10.02-r0
+mamba-package-2024.10.02-r1
+mamba-package-2024.10.02-r2
+mamba-package-2024.10.02-r3
+micromamba-2024.03.25-r1
+micromamba-2024.03.25-r2
+micromamba-2024.03.25-r3
+micromamba-2024.03.25-r4
+micromamba-2024.03.25-r5
+micromamba-2024.08.31-r0
+micromamba-2024.08.31-r1
+micromamba-2024.09.30-r0
+micromamba-2024.10.02-r0
+micromamba-2024.10.02-r1
+micromamba-2024.10.02-r2
+micromamba-2024.10.02-r3
+py3-libmambapy-2024.03.25-r0
+py3-libmambapy-2024.03.25-r1
+py3-libmambapy-2024.03.25-r2
+py3-libmambapy-2024.03.25-r3
+py3-libmambapy-2024.03.25-r4
+py3-libmambapy-2024.03.25-r5
+py3-libmambapy-2024.08.31-r0
+py3-libmambapy-2024.08.31-r1
+py3-libmambapy-2024.09.30-r0
+py3-libmambapy-2024.10.02-r0
+py3-supported-libmambapy-2024.10.02-r1
+py3.10-libmambapy-2024.10.02-r1
+py3.11-libmambapy-2024.10.02-r1
+py3.12-libmambapy-2024.10.02-r1
+py3.13-libmambapy-2024.10.02-r1
+py3-supported-libmambapy-2024.10.02-r2
+py3.10-libmambapy-2024.10.02-r2
+py3.11-libmambapy-2024.10.02-r2
+py3.12-libmambapy-2024.10.02-r2
+py3.13-libmambapy-2024.10.02-r2
+py3-supported-libmambapy-2024.10.02-r3
+py3.10-libmambapy-2024.10.02-r3
+py3.11-libmambapy-2024.10.02-r3
+py3.12-libmambapy-2024.10.02-r3
+py3.13-libmambapy-2024.10.02-r3
+py3-google-cloud-pubsub-2.25.0-r0.apk
+py3-google-cloud-pubsub-2.25.1-r0.apk
+py3-google-cloud-pubsub-2.25.2-r0.apk
+py3-google-cloud-pubsub-2.26.0-r0.apk
+py3-google-cloud-pubsub-2.26.1-r0.apk
+py3-google-cloud-pubsub-2.27.0-r0.apk
+py3-google-cloud-pubsub-2.27.1-r0.apk
+py3-google-cloud-pubsub-2.27.2-r0.apk
 mockery-3-r0.apk
 mockery-3-r1.apk
 mockery-3-r2.apk