From 7f25263d26aadd5c58f3fa0aa240af963a142c23 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Fri, 30 Aug 2024 18:39:12 +0400 Subject: [PATCH] release(v1.8.0-alpha.2): prepare release This is the official v1.8.0-alpha.2 release. Signed-off-by: Andrey Smirnov --- .github/workflows/ci.yaml | 4 +- CHANGELOG.md | 50 ++++++++++++++++++ README.md | 1 + hack/release.sh | 89 +++++++++++++++++++++++++++++++-- internal/overlays/overlays.yaml | 18 ++++--- 5 files changed, 149 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 79fab78..876efd6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-08-08T15:42:07Z by kres dbf015a. +# Generated on 2024-08-30T14:38:41Z by kres b5ca957. name: default concurrency: @@ -31,7 +31,7 @@ jobs: if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/')) services: buildkitd: - image: moby/buildkit:v0.15.1 + image: moby/buildkit:v0.15.2 options: --privileged ports: - 1234:1234 diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fb6d73..0a8f20c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,53 @@ +## [overlays 1.8.0-alpha.2](https://github.com/siderolabs/overlays/releases/tag/v1.8.0-alpha.2) (2024-08-30) + +Welcome to the v1.8.0-alpha.2 release of overlays! +*This is a pre-release of overlays* + + + +Please try out the release binaries and report any issues at +https://github.com/siderolabs/overlays/issues. + +### SBC support + +Updates for the following overlays: + +* [Raspberry Pi](https://github.com/siderolabs/sbc-raspberrypi/) +* [RockChip](https://github.com/siderolabs/sbc-rockchip/) + + +### Contributors + +* Andrey Smirnov +* Noel Georgi + +### Changes +
6 commits +

+ +* [`eab2050`](https://github.com/siderolabs/overlays/commit/eab2050382724b95da407cd8d760ff21d94687c0) chore: update overlays +* [`9dfc7cc`](https://github.com/siderolabs/overlays/commit/9dfc7cc15ee9472add3240951ad7c930a8ff1408) release(v1.8.0-alpha.1): prepare release +* [`6992852`](https://github.com/siderolabs/overlays/commit/6992852bb8b5633fed594bda0b366b524ac551e3) feat: bump overlays rockchip & raspberrypi +* [`1a3848b`](https://github.com/siderolabs/overlays/commit/1a3848be2d0b6908d6f86019f4d20993145f0788) release(v1.8.0-alpha.0): prepare release +* [`37c0575`](https://github.com/siderolabs/overlays/commit/37c057526a1c3cab8cce067fb767c68711f219d5) feat: update sbc-rockchip to v0.1.0-beta.1 +* [`c2bec3b`](https://github.com/siderolabs/overlays/commit/c2bec3b4a33c7a0b8eef628f6cfa47b5c0779329) release(v1.7.0-beta.0): prepare release +

+
+ +### Changes since v1.8.0-alpha.1 +
1 commit +

+ +* [`eab2050`](https://github.com/siderolabs/overlays/commit/eab2050382724b95da407cd8d760ff21d94687c0) chore: update overlays +

+
+ +### Dependency Changes + +This release has no dependency changes + +Previous release can be found at [v1.7.0](https://github.com/siderolabs/overlays/releases/tag/v1.7.0) + ## [overlays 1.8.0-alpha.1](https://github.com/siderolabs/overlays/releases/tag/v1.8.0-alpha.1) (2024-07-08) Welcome to the v1.8.0-alpha.1 release of overlays! diff --git a/README.md b/README.md index 7cfa797..3f4ef24 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ The list of available overlays can be found in the [Overlays Catalog](#overlays- | ---------------------- | ------------------------------- | ---------------------------------------------------------------- | | rpi_generic | Raspberry Pi 4/Compute Module 4 | [sbc-raspberrypi](https://github.com/siderolabs/sbc-raspberrypi) | | nanopi-r4s | NanoPi R4S | [sbc-rockchip](https://github.com/siderolabs/sbc-rockchip) | +| nanopi-r5s | NanoPi R5S | [sbc-rockchip](https://github.com/siderolabs/sbc-rockchip) | | rock64 | Pine64 Rock64 | [sbc-rockchip](https://github.com/siderolabs/sbc-rockchip) | | rockpi4 | Rock Pi 4A,Rock Pi 4B | [sbc-rockchip](https://github.com/siderolabs/sbc-rockchip) | | rockpi4c | Rock Pi 4C | [sbc-rockchip](https://github.com/siderolabs/sbc-rockchip) | diff --git a/hack/release.sh b/hack/release.sh index 7381986..3b8805d 100755 --- a/hack/release.sh +++ b/hack/release.sh @@ -1,8 +1,8 @@ -#!/bin/bash +#!/usr/bin/env bash # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-03-14T14:44:03Z by kres latest. +# Generated on 2024-08-30T14:38:41Z by kres b5ca957. set -e @@ -44,9 +44,92 @@ function commit { exit 1 fi + if is_on_main_branch; then + update_license_files + fi + git commit -s -m "release($1): prepare release" -m "This is the official $1 release." } +function is_on_main_branch { + main_remotes=("upstream" "origin") + branch_names=("main" "master") + current_branch=$(git rev-parse --abbrev-ref HEAD) + + echo "Check current branch: $current_branch" + + for remote in "${main_remotes[@]}"; do + echo "Fetch remote $remote..." + + if ! git fetch --quiet "$remote" &>/dev/null; then + echo "Failed to fetch $remote, skip..." + + continue + fi + + for branch_name in "${branch_names[@]}"; do + if ! git rev-parse --verify "$branch_name" &>/dev/null; then + echo "Branch $branch_name does not exist, skip..." + + continue + fi + + echo "Branch $remote/$branch_name exists, comparing..." + + merge_base=$(git merge-base "$current_branch" "$remote/$branch_name") + latest_main=$(git rev-parse "$remote/$branch_name") + + if [ "$merge_base" = "$latest_main" ]; then + echo "Current branch is up-to-date with $remote/$branch_name" + + return 0 + else + echo "Current branch is not on $remote/$branch_name" + + return 1 + fi + done + done + + echo "No main or master branch found on any remote" + + return 1 +} + +function update_license_files { + script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + parent_dir="$(dirname "$script_dir")" + current_year=$(date +"%Y") + change_date=$(date -v+4y +"%Y-%m-%d" 2>/dev/null || date -d "+4 years" +"%Y-%m-%d" 2>/dev/null || date --date="+4 years" +"%Y-%m-%d") + + # Find LICENSE and .kres.yaml files recursively in the parent directory (project root) + find "$parent_dir" \( -name "LICENSE" -o -name ".kres.yaml" \) -type f | while read -r file; do + temp_file="${file}.tmp" + + if [[ $file == *"LICENSE" ]]; then + if grep -q "^Business Source License" "$file"; then + sed -e "s/The Licensed Work is (c) [0-9]\{4\}/The Licensed Work is (c) $current_year/" \ + -e "s/Change Date: [0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}/Change Date: $change_date/" \ + "$file" >"$temp_file" + else + continue # Not a Business Source License file + fi + elif [[ $file == *".kres.yaml" ]]; then + sed -E 's/^([[:space:]]*)ChangeDate:.*$/\1ChangeDate: "'"$change_date"'"/' "$file" >"$temp_file" + fi + + # Check if the file has changed + if ! cmp -s "$file" "$temp_file"; then + mv "$temp_file" "$file" + echo "Updated: $file" + git add "$file" + else + echo "No changes: $file" + rm "$temp_file" + fi + done +} + if declare -f "$1" > /dev/null then cmd="$1" @@ -55,7 +138,7 @@ then else cat <