fix: release next catalog source (#1564)

Signed-off-by: Anatolii Bazko <abazko@redhat.com>

Signed-off-by: Anatolii Bazko <abazko@redhat.com>

.github/workflows/release-next-catalog.yaml

@@ -36,13 +36,4 @@ jobs:
         username: ${{ secrets.QUAY_USERNAME }}
         password: ${{ secrets.QUAY_PASSWORD }}
     - name: Release next catalog
-      run: |
-        git config --global user.name "Anatolii Bazko"
-        git config --global user.email "abazko@redhat.com"
-        export GITHUB_TOKEN=${{ secrets.CHE_BOT_GITHUB_TOKEN }}
-
-        ${GITHUB_WORKSPACE}/build/scripts/olm/release-catalog.sh --channel 'next' --catalog-image quay.io/eclipse/eclipse-che-olm-catalog:next
-        
-        git add -A olm-catalog/next
-        git commit -m "chore(catalog): release "
-        git push origin main
+      run: ${GITHUB_WORKSPACE}/build/scripts/olm/release-catalog.sh --channel 'next' --catalog-image quay.io/eclipse/eclipse-che-olm-catalog:next

build/scripts/olm/release-catalog.sh

@@ -73,7 +73,11 @@ build () {
     echo "[INFO] Add bundle to the catalog"
     LAST_BUNDLE_NAME=$(yq -r '.entries | .[length - 1].name' "${CHANNEL_PATH}")
     make bundle-render CHANNEL="${CHANNEL}" BUNDLE_NAME="${BUNDLE_NAME}" BUNDLE_IMG="${BUNDLE_IMAGE}"
-    yq -riY '(.entries) += [{"name": "'${BUNDLE_NAME}'", "replaces": "'${LAST_BUNDLE_NAME}'"}]' "${CHANNEL_PATH}"
+    if [[ ${CHANNEL} == "stable" ]]; then
+      yq -riY '(.entries) += [{"name": "'${BUNDLE_NAME}'", "replaces": "'${LAST_BUNDLE_NAME}'"}]' "${CHANNEL_PATH}"
+    else
+      yq -riY '(.entries) = [{"name": "'${BUNDLE_NAME}'", "skipRange": "<'${BUNDLE_VERSION}'"}]' "${CHANNEL_PATH}"
+    fi
   fi
 
   echo "[INFO] Build and push the catalog image"

bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml

@@ -77,7 +77,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/eclipse-che/che-operator
     support: Eclipse Foundation
-  name: eclipse-che.v7.57.0-727.next
+  name: eclipse-che.v7.57.0-729.next
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -1241,7 +1241,7 @@ spec:
   minKubeVersion: 1.19.0
   provider:
     name: Eclipse Foundation
-  version: 7.57.0-727.next
+  version: 7.57.0-729.next
   webhookdefinitions:
     - admissionReviewVersions:
         - v1

olm-catalog/next/channel.yaml

@@ -14,8 +14,4 @@ schema: olm.channel
 package: eclipse-che
 name: next
 entries:
-  - name: eclipse-che.v7.56.0-724.next
-  - name: eclipse-che.v7.57.0-725.next
-    replaces: eclipse-che.v7.56.0-724.next
-  - name: eclipse-che.v7.57.0-726.next
-    replaces: eclipse-che.v7.57.0-725.next
+