Merge pull request #1759 from rancher/improve_release_scripts

Improve release scripts
rancher · Sep 6, 2023 · a967108 · a967108
2 parents e0df246 + c68b5a1
commit a967108
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/.github/scripts/release-against-charts.sh b/.github/scripts/release-against-charts.sh
@@ -27,34 +27,32 @@ if [ ! -f bin/charts-build-scripts ]; then
     make pull-scripts
 fi
 
-find ./packages/fleet/ -type f -exec sed -i -e "s/${PREV_FLEET_VERSION}/${NEW_FLEET_VERSION}/g" {} \;
-find ./packages/fleet/ -type f -exec sed -i -e "s/version: ${PREV_CHART_VERSION}/version: ${NEW_CHART_VERSION}/g" {} \;
-
-if [ "${REPLACE}" == "true" ]; then
-    sed -i -e "s/${PREV_CHART_VERSION}+up${PREV_FLEET_VERSION}/${NEW_CHART_VERSION}+up${NEW_FLEET_VERSION}/g" release.yaml
+if grep -q "version: ${PREV_CHART_VERSION}" ./packages/fleet/fleet/package.yaml && grep -q "${PREV_FLEET_VERSION}" ./packages/fleet/fleet/package.yaml; then
+    find ./packages/fleet/ -type f -exec sed -i -e "s/${PREV_FLEET_VERSION}/${NEW_FLEET_VERSION}/g" {} \;
+    find ./packages/fleet/ -type f -exec sed -i -e "s/version: ${PREV_CHART_VERSION}/version: ${NEW_CHART_VERSION}/g" {} \;
 else
-    if grep -q "fleet:" release.yaml; then
-        sed -i -e "s/- ${PREV_CHART_VERSION}+up${PREV_FLEET_VERSION}/- ${PREV_CHART_VERSION}+up${PREV_FLEET_VERSION}\n- ${NEW_CHART_VERSION}+up${NEW_FLEET_VERSION}/g" release.yaml
-    else
-        cat <<< "fleet:
-- ${PREV_CHART_VERSION}+up${PREV_FLEET_VERSION}
-- ${NEW_CHART_VERSION}+up${NEW_FLEET_VERSION}
-fleet-agent:
-- ${PREV_CHART_VERSION}+up${PREV_FLEET_VERSION}
-- ${NEW_CHART_VERSION}+up${NEW_FLEET_VERSION}
-fleet-crd:
-- ${PREV_CHART_VERSION}+up${PREV_FLEET_VERSION}
-- ${NEW_CHART_VERSION}+up${NEW_FLEET_VERSION}" >> release.yaml
-    # remove empty line above fleet
-    sed -i -z -e  "s/[[:space:]]*\nfleet:/\nfleet:/g" release.yaml
-    fi
+    echo "Previous Fleet version references do not exist in ./packages/fleet/ so replacing it with the new version is not possible. Exiting..."
+    exit 1
 fi
 
+for i in fleet fleet-crd fleet-agent; do
+    if [ "${REPLACE}" == "true" ]; then
+        yq --inplace "del( .${i}.[] | select(. == \"${PREV_CHART_VERSION}+up${PREV_FLEET_VERSION}\") )" release.yaml
+    fi
+    yq --inplace ".${i} += \"${NEW_CHART_VERSION}+up${NEW_FLEET_VERSION}\"" release.yaml
+done
+
+# Follow the currently applied no identation style for arrays in release.yaml,
+# which is not possible with yq v4 atm: https://github.com/mikefarah/yq/issues/1309
+sed -i "s/^  -/-/" release.yaml
+
 git add packages/fleet release.yaml
 git commit -m "Updating to Fleet v${NEW_FLEET_VERSION}"
 
 if [ "${REPLACE}" == "true" ]; then
-for i in fleet fleet-crd fleet-agent; do CHART=$i VERSION=${PREV_CHART_VERSION}+up${PREV_FLEET_VERSION} make remove; done
+    for i in fleet fleet-crd fleet-agent; do
+        CHART=$i VERSION=${PREV_CHART_VERSION}+up${PREV_FLEET_VERSION} make remove
+    done
 fi
 
 PACKAGE=fleet make charts

diff --git a/.github/workflows/release-against-charts.yml b/.github/workflows/release-against-charts.yml
@@ -47,6 +47,8 @@ jobs:
           repository: rancher/charts
           ref: ${{github.event.inputs.charts_ref}}
           path: charts
+      - name: Install dependencies
+        run: sudo snap install yq --channel=v4/stable
       - name: Run release script
         run: ./fleet/.github/scripts/release-against-charts.sh ${{github.event.inputs.prev_fleet}} ${{github.event.inputs.new_fleet}} ${{github.event.inputs.prev_chart}}  ${{github.event.inputs.new_chart}}  ${{github.event.inputs.should_replace}}
       - name: Create Pull Request