From 0a794a9a6b6a1616ed7f871c016d48d1ea7c55d6 Mon Sep 17 00:00:00 2001 From: Wesley van Tilburg Date: Sun, 1 Mar 2026 16:47:28 +0100 Subject: [PATCH] ci: generate changelog --- .gitea/workflows/build.yaml | 49 ++++++++------- changelog.sh | 117 ++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+), 25 deletions(-) create mode 100755 changelog.sh diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 8319e56..0a2db5b 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -11,14 +11,13 @@ jobs: build_push: name: Build and push image runs-on: coole-runner - strategy: - fail-fast: false - matrix: - image: [asahi-cosmic] - version: [43] + + env: + IMAGE: asahi-cosmic + VERSION: 43 container: - image: "quay.io/fedora-ostree-desktops/buildroot:${{ matrix.version }}" + image: "quay.io/fedora-ostree-desktops/buildroot:${{ env.VERSION }}" options: "--security-opt=label=disable --privileged --user 0:0 --device=/dev/fuse --volume /:/run/host:rw" steps: @@ -26,7 +25,7 @@ jobs: - name: Install rpm-ostree + tools run: | dnf upgrade -y --enablerepo=updates-testing --refresh rpm-ostree - dnf install -y nodejs skopeo jq buildah rsync + dnf install -y nodejs skopeo jq buildah rsync git mkdir -p ~/.docker - name: Fix containers/storage.conf @@ -35,6 +34,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Log in to registry uses: redhat-actions/podman-login@v1 @@ -43,18 +44,15 @@ jobs: username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.REGISTRY_TOKEN }} auth_file_path: /tmp/auth.json - + - name: Build rootfs with rpm-ostree run: | - cd "$GITHUB_WORKSPACE" - sudo -E ./builder.sh "${{ matrix.image }}" "${{ matrix.version }}" + sudo -E ./builder.sh "${IMAGE}" "${VERSION}" - name: Build and push OCI image from rootfs run: | set -xeuo pipefail - IMAGE="${{ matrix.image }}" - VERSION="${{ matrix.version }}" REGISTRY="git.plabble.org/misthios" ROOTFS="images/${IMAGE}/rootfs" @@ -71,10 +69,7 @@ jobs: echo "${buildid}" > .buildid fi - version="${VERSION}" - full_tag="${version}.${buildid}" - - echo "Building OCI image from rootfs..." + full_tag="${VERSION}.${buildid}" export STORAGE_DRIVER=vfs @@ -83,18 +78,13 @@ jobs: rsync -aHAX "${ROOTFS}/" "${mnt}/" - # REQUIRED FOR BOOTC buildah config --label containers.bootc=1 "${ctr}" buildah config --env container=oci "${ctr}" - - # CMD buildah config --cmd "/sbin/init" "${ctr}" buildah commit "${ctr}" "localhost/${IMAGE}:${full_tag}" buildah unmount "${ctr}" - echo "Pushing image to registry..." - skopeo copy \ --authfile /tmp/auth.json \ containers-storage:localhost/${IMAGE}:${full_tag} \ @@ -103,8 +93,17 @@ jobs: skopeo copy \ --authfile /tmp/auth.json \ containers-storage:localhost/${IMAGE}:${full_tag} \ - docker://${REGISTRY}/${IMAGE}:${version} + docker://${REGISTRY}/${IMAGE}:${VERSION} - echo "Pushed:" - echo " - ${REGISTRY}/${IMAGE}:${full_tag}" - echo " - ${REGISTRY}/${IMAGE}:${version}" + - name: Generate changelog + run: | + ./changelog.sh "${IMAGE}" "${VERSION}" + + - name: Commit and push changelog + if: github.ref == 'refs/heads/main' + run: | + git config user.name "Automation" + git config user.email "actions@invalid.tld" + git add changelogs/ + git commit -m "Update changelog for ${IMAGE} ${VERSION} build $(cat .buildid)" || echo "No changes" + git push diff --git a/changelog.sh b/changelog.sh new file mode 100755 index 0000000..3cb0d3c --- /dev/null +++ b/changelog.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash +set -euo pipefail + +IMAGE="$1" +VERSION="$2" + +ROOTFS="images/${IMAGE}/rootfs" +CHANGELOG_DIR="changelogs/${IMAGE}" + +mkdir -p "${CHANGELOG_DIR}" + +PKG_CUR="${CHANGELOG_DIR}/packages-current.txt" +PKG_PREV="${CHANGELOG_DIR}/packages-latest.txt" +BUILD_ID="$(cat .buildid)" +CHANGELOG_FILE="${CHANGELOG_DIR}/${VERSION}.${BUILD_ID}.json" + +# Extract package list (name + evr) +rpm -qa --root "${ROOTFS}" --qf '%{NAME} %{EVR}\n' | sort > "${PKG_CUR}" + +if [[ -f "${PKG_PREV}" ]]; then + CUR_NAMES="$(cut -d' ' -f1 "${PKG_CUR}" | sort)" + PREV_NAMES="$(cut -d' ' -f1 "${PKG_PREV}" | sort)" + + ADDED_NAMES="$(comm -13 <(echo "${PREV_NAMES}") <(echo "${CUR_NAMES}"))" + REMOVED_NAMES="$(comm -23 <(echo "${PREV_NAMES}") <(echo "${CUR_NAMES}"))" + COMMON_NAMES="$(comm -12 <(echo "${PREV_NAMES}") <(echo "${CUR_NAMES}"))" + + ADDED_LIST=() + while read -r name; do + [[ -z "$name" ]] && continue + ver="$(grep -E "^${name} " "${PKG_CUR}" | awk '{print $2}')" + ADDED_LIST+=("${name} ${ver}") + done <<< "${ADDED_NAMES}" + + REMOVED_LIST=() + while read -r name; do + [[ -z "$name" ]] && continue + ver="$(grep -E "^${name} " "${PKG_PREV}" | awk '{print $2}')" + REMOVED_LIST+=("${name} ${ver}") + done <<< "${REMOVED_NAMES}" + + UPDATED_LIST=() + while read -r name; do + [[ -z "$name" ]] && continue + old_ver="$(grep -E "^${name} " "${PKG_PREV}" | awk '{print $2}')" + new_ver="$(grep -E "^${name} " "${PKG_CUR}" | awk '{print $2}')" + if [[ "${old_ver}" != "${new_ver}" ]]; then + UPDATED_LIST+=("${name} ${old_ver} -> ${new_ver}") + fi + done <<< "${COMMON_NAMES}" + + ADDED_COUNT="${#ADDED_LIST[@]}" + REMOVED_COUNT="${#REMOVED_LIST[@]}" + UPDATED_COUNT="${#UPDATED_LIST[@]}" + + { + echo "{" + echo " \"image\": \"${IMAGE}\"," + echo " \"version\": \"${VERSION}\"," + echo " \"build_id\": \"${BUILD_ID}\"," + echo " \"added_count\": ${ADDED_COUNT}," + echo " \"removed_count\": ${REMOVED_COUNT}," + echo " \"updated_count\": ${UPDATED_COUNT}," + echo " \"added\": [" + for i in "${!ADDED_LIST[@]}"; do + sep=$([[ $i -lt $((ADDED_COUNT-1)) ]] && echo "," || echo "") + printf ' "%s"%s\n' "${ADDED_LIST[$i]}" "${sep}" + done + echo " ]," + echo " \"removed\": [" + for i in "${!REMOVED_LIST[@]}"; do + sep=$([[ $i -lt $((REMOVED_COUNT-1)) ]] && echo "," || echo "") + printf ' "%s"%s\n' "${REMOVED_LIST[$i]}" "${sep}" + done + echo " ]," + echo " \"updated\": [" + for i in "${!UPDATED_LIST[@]}"; do + sep=$([[ $i -lt $((UPDATED_COUNT-1)) ]] && echo "," || echo "") + printf ' "%s"%s\n' "${UPDATED_LIST[$i]}" "${sep}" + done + echo " ]" + echo "}" + } > "${CHANGELOG_FILE}" + +else + # First build: everything is added + ADDED_LIST=() + while read -r name ver; do + ADDED_LIST+=("${name} ${ver}") + done < "${PKG_CUR}" + + ADDED_COUNT="${#ADDED_LIST[@]}" + + { + echo "{" + echo " \"image\": \"${IMAGE}\"," + echo " \"version\": \"${VERSION}\"," + echo " \"build_id\": \"${BUILD_ID}\"," + echo " \"added_count\": ${ADDED_COUNT}," + echo " \"removed_count\": 0," + echo " \"updated_count\": 0," + echo " \"added\": [" + for i in "${!ADDED_LIST[@]}"; do + sep=$([[ $i -lt $((ADDED_COUNT-1)) ]] && echo "," || echo "") + printf ' "%s"%s\n' "${ADDED_LIST[$i]}" "${sep}" + done + echo " ]," + echo " \"removed\": []," + echo " \"updated\": []" + echo "}" + } > "${CHANGELOG_FILE}" +fi + +# Update latest snapshot +mv "${PKG_CUR}" "${PKG_PREV}" + +echo "Changelog written to ${CHANGELOG_FILE}"