Switch to dashes instead of plus for revbumps

"+" is for metadata and not numeric versioning, in fact it cannot be
compared and for e.g. a+1 and a+2 are at the same version when comparing
in semver notation.
By using dashes we refer to internal numbering, and instead can be
ordered

Fixes #679

Signed-off-by: Ettore Di Giacinto <edigiacinto@suse.com>

.github/workflows/autobump.yaml

@@ -15,6 +15,7 @@ jobs:
       AUTO_GIT: true
       GIT_SIGNOFF: true
       LUET_NOLOCK: true
+      REVBUMP_CHAR: "-"
       LUET_YES: true
       TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
       GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}

packages/base-dracut-modules/definition.yaml

@@ -1,4 +1,4 @@
 name: "base-dracut-modules"
 category: "system"
-version: 0.1.1+19
+version: 0.1.1-19
 description: "Base modules for creating an initrd with dracut for cOS derivatives"

packages/cloud-config/definition.yaml

@@ -1,3 +1,3 @@
 name: cloud-config
 category: system
-version: 0.9+6
+version: 0.9-6

packages/cos-features/definition.yaml

@@ -1,6 +1,6 @@
 name: cos-features
 category: system
-version: 0.4+6
+version: 0.4-6
 requires:
   - name: "yip"
     category: "toolchain"

packages/cos-setup/definition.yaml

@@ -1,6 +1,6 @@
 name: cos-setup
 category: system
-version: 0.4+6
+version: 0.4-6
 requires:
   - name: "yip"
     category: "toolchain"

packages/cos/collection.yaml

@@ -1,32 +1,32 @@
 packages:
   - name: "cos"
     category: "system"
-    version: 0.6.8+13
+    version: 0.6.8-13
     description: "cOS base image, used to build cOS live ISOs"
     brand_name: "cOS"
     labels:
       autobump.revdeps: "true"
       autobump.revbump_related: "recovery/cos-img recovery/cos-squash"
   - name: "cos-container"
     category: "system"
-    version: 0.6.8+11
+    version: 0.6.8-11
     brand_name: "cOS"
     description: "cOS container image, used to build cOS derivatives from scratch"
     labels:
       autobump.revdeps: "true"
       autobump.revbump_related: "recovery/cos-img recovery/cos-squash"
   - name: "cos"
     category: "recovery"
-    version: 0.6.8+13
+    version: 0.6.8-13
     brand_name: "cOS recovery"
     description: "cOS recovery image, used to boot cOS for troubleshooting"
     labels:
       autobump.revdeps: "true"
       autobump.revbump_related: "recovery/cos-img recovery/cos-squash"
   - name: "cos-img"
     category: "recovery"
-    version: 0.6.8+13
+    version: 0.6.8-13
     brand_name: "cOS"
   - name: "cos-squash"
     category: "recovery"
-    version: 0.6.8+13
+    version: 0.6.8-13

packages/golang/build.yaml

@@ -15,7 +15,7 @@ prelude:
 {{end}}
 {{end}}
 - |
-  PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && \
+  PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && \
   wget {{.Values.base_url}}/go$PACKAGE_VERSION.linux-{{.Values.golang_arch}}.tar.gz -O golang.tar.gz
 {{ template "do_checksum" (dict "values" .Values "filename" "golang.tar.gz")}}
 

packages/golang/collection.yaml

@@ -1,7 +1,7 @@
 packages:
   - name: "golang"
     category: "build"
-    version: 1.17.1+3
+    version: 1.17.1-3
     base_url: https://golang.org/dl
     hidden: true # No need to make it installable for now
     labels:
@@ -19,7 +19,7 @@ packages:
       package.checksum: "dab7d9c34361dc21ec237d584590d72500652e7c909bf082758fb63064fca0ef"
   - name: "golang-fips"
     category: "build"
-    version: 1.16.7b7+6
+    version: 1.16.7b7-6
     base_url: https://go-boringcrypto.storage.googleapis.com
     hidden: true # No need to make it installable for now
     labels:

packages/grub2/collection.yaml

@@ -1,18 +1,18 @@
 packages:
   - name: "grub2-artifacts"
     category: "system"
-    version: 0.0.3+3
+    version: 0.0.3-3
     provides:
       - name: "grub-artifacts"
         version: ">0.0.2"
   - name: "grub2-config"
     category: "system"
-    version: 0.0.13+3
+    version: 0.0.13-3
     provides:
       - name: "grub-config"
         version: ">0.0.12"
   - name: "grub2-efi-image"
     category: "system"
-    version: 0.0.1+3
+    version: 0.0.1-3
     # TODO: Modules list could be refined
     efi_modules: ext2 iso9660 linux echo configfile search_label search_fs_file search search_fs_uuid ls normal gzio png fat gettext font minicmd gfxterm gfxmenu all_video xfs gcry_rijndael gcry_sha256 gcry_sha512 test true loadenv part_gpt part_msdos efi_gop efi_uga

packages/immutable-rootfs/definition.yaml

@@ -1,3 +1,3 @@
 name: "immutable-rootfs"
 category: "system"
-version: 0.2.0+6
+version: 0.2.0-6

packages/initrd/definition.yaml

@@ -1,4 +1,4 @@
 name: "dracut-initrd"
 category: "system"
-version: 0.1.1+19
+version: 0.1.1-19
 description: "Dracut-based generated initrd"

packages/installer/definition.yaml

@@ -1,3 +1,3 @@
 name: "installer"
 category: "utils"
-version: 0.16.4+5
+version: 0.16.4-5

packages/kernel/definition.yaml

@@ -1,4 +1,4 @@
 name: "kernel"
 category: "system"
-version: 0.1.1+19
+version: 0.1.1-19
 description: "Kernel extracted from the upstream repositories"

packages/selinux/collection.yaml

@@ -1,7 +1,7 @@
 packages:
   - name: "k3s"
     category: "selinux"
-    version: 0.3.0+6
+    version: 0.3.0-6
     labels:
       github.repo: "k3s-selinux"
       github.owner: "k3s-io"
@@ -14,7 +14,7 @@ packages:
         curl -s -L "https://github.com/{{.Values.labels.github.owner}}/{{.Values.labels.github.repo}}/releases/download/{{.Values.labels.github.tag}}/sha256sum-centos7-noarch.txt" | grep "noarch" | cut -d" " -f 1
   - name: "rancher"
     category: "selinux"
-    version: 0.1.1+6
+    version: 0.1.1-6
     labels:
       github.repo: "rancher-selinux"
       github.owner: "rancher"

packages/toolchain/collection.yaml

@@ -1,7 +1,7 @@
 packages:
   - category: "toolchain"
     name: "luet"
-    version: 0.17.11+1
+    version: 0.17.11-1
     branch: ""
     upx: false
     fips: false
@@ -12,7 +12,7 @@ packages:
       autobump.revbump_related: "system/cos recovery/cos recovery/cos-img recovery/cos-squash"
   - category: "toolchain-fips"
     name: "luet"
-    version: 0.17.11+1
+    version: 0.17.11-1
     branch: ""
     upx: false
     fips: true
@@ -23,7 +23,7 @@ packages:
       autobump.revbump_related: "system/cos recovery/cos recovery/cos-img recovery/cos-squash"
   - name: "luet-makeiso"
     category: "toolchain"
-    version: 0.3.8+8
+    version: 0.3.8-8
     upx: false
     fips: false
     labels:
@@ -32,7 +32,7 @@ packages:
       autobump.revdeps: "true"
   - name: "luet-makeiso"
     category: "toolchain-fips"
-    version: 0.3.8+8
+    version: 0.3.8-8
     upx: false
     fips: true
     labels:
@@ -43,7 +43,7 @@ packages:
     name: "yip"
     upx: false
     fips: true
-    version: 0.9.12+2
+    version: 0.9.12-2
     labels:
       github.repo: "yip"
       github.owner: "mudler"
@@ -53,7 +53,7 @@ packages:
     name: "yip"
     upx: false
     fips: false
-    version: 0.9.12+3
+    version: 0.9.12-3
     labels:
       github.repo: "yip"
       github.owner: "mudler"

packages/toolchain/luet-mtree/definition.yaml

@@ -1,6 +1,6 @@
 name: "luet-mtree"
 category: "toolchain"
-version: 0.0.8+18
+version: 0.0.8-18
 labels:
   github.repo: "luet-mtree"
   github.owner: "rancher-sandbox"

packages/toolchain/yq/definition.yaml

@@ -1,6 +1,6 @@
 name: "yq"
 category: "toolchain"
-version: 4.13.0+2
+version: 4.13.0-2
 uri:
   - https://github.com/mikefarah/yq
 license: "MIT"

packages/utils/gomplate/build.yaml

@@ -18,7 +18,7 @@ prelude:
 {{end}}
 {{end}}
 - |
-   PACKAGE_VERSION=v${PACKAGE_VERSION%\+*} && \
+   PACKAGE_VERSION=v${PACKAGE_VERSION%\-*} && \
    git clone --depth=1 --branch ${PACKAGE_VERSION} https://github.com/{{ ( index .Values.labels "github.owner" ) }}/{{ ( index .Values.labels "github.repo" ) }}.git
 steps:
 - |

packages/utils/gomplate/definition.yaml

@@ -1,6 +1,6 @@
 name: gomplate
 category: utils
-version: 3.9.0+23
+version: 3.9.0-23
 labels:
   github.repo: "gomplate"
   github.owner: "hairyhenderson"

packages/utils/jq/definition.yaml

@@ -1,6 +1,6 @@
 name: jq
 category: utils
-version: 1.6+22
+version: 1.6-22
 labels:
   github.repo: "jq"
   github.owner: "stedolan"

packages/utils/k9s/build.yaml

@@ -15,7 +15,7 @@ prelude:
 {{end}}
 {{end}}
 - |
-   PACKAGE_VERSION=v${PACKAGE_VERSION%\+*} && \
+   PACKAGE_VERSION=v${PACKAGE_VERSION%\-*} && \
    git clone --depth=1 --branch ${PACKAGE_VERSION} https://github.com/derailed/k9s
 steps:
 - |

packages/utils/k9s/definition.yaml

@@ -1,6 +1,6 @@
 name: "k9s"
 category: "utils"
-version: 0.24.15+11
+version: 0.24.15-11
 platform: Linux
 labels:
   github.repo: "k9s"

packages/utils/nerdctl/build.yaml

@@ -15,7 +15,7 @@ prelude:
 {{end}}
 {{end}}
 - |
-   PACKAGE_VERSION=v${PACKAGE_VERSION%\+*} && \
+   PACKAGE_VERSION=v${PACKAGE_VERSION%\-*} && \
    git clone --depth=1 --branch ${PACKAGE_VERSION} https://github.com/containerd/nerdctl
 steps:
 - |

packages/utils/nerdctl/definition.yaml

@@ -1,6 +1,6 @@
 name: "nerdctl"
 category: "utils"
-version: 0.11.2+1
+version: 0.11.2-1
 platform: linux
 labels:
   github.repo: "nerdctl"

packages/utils/rancherd/build.yaml

@@ -15,7 +15,7 @@ prelude:
 {{end}}
 {{end}}
 - |
-   PACKAGE_VERSION=v${PACKAGE_VERSION%\+*} && \
+   PACKAGE_VERSION=v${PACKAGE_VERSION%\-*} && \
    git clone --depth=1 --branch ${PACKAGE_VERSION}  https://github.com/rancher/rancherd
 steps:
 - |

packages/utils/rancherd/definition.yaml

@@ -1,6 +1,6 @@
 name: "rancherd"
 category: "utils"
-version: 0.0.1-alpha07+8
+version: 0.0.1-alpha07-8
 platform: linux
 labels:
   github.repo: "rancherd"