Skip to content

Commit

Permalink
release(v1.8.0-alpha.2): prepare release
Browse files Browse the repository at this point in the history
This is the official v1.8.0-alpha.2 release.

Signed-off-by: Andrey Smirnov <[email protected]>
  • Loading branch information
smira committed Aug 30, 2024
1 parent eab2050 commit 7f25263
Show file tree
Hide file tree
Showing 5 changed files with 149 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand Down
50 changes: 50 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
<details><summary>6 commits</summary>
<p>

* [`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
</p>
</details>

### Changes since v1.8.0-alpha.1
<details><summary>1 commit</summary>
<p>

* [`eab2050`](https://github.com/siderolabs/overlays/commit/eab2050382724b95da407cd8d760ff21d94687c0) chore: update overlays
</p>
</details>

### 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!
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) |
Expand Down
89 changes: 86 additions & 3 deletions hack/release.sh
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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"
Expand All @@ -55,7 +138,7 @@ then
else
cat <<EOF
Usage:
commit: Create the official release commit message.
commit: Create the official release commit message (updates BUSL license dates if there is any).
cherry-pick: Cherry-pick a commit into a release branch.
changelog: Update the specified CHANGELOG.
release-notes: Create release notes for GitHub release.
Expand Down
18 changes: 10 additions & 8 deletions internal/overlays/overlays.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,23 @@ overlays:
- name: rpi_generic
image: ghcr.io/siderolabs/sbc-raspberrypi:v0.1.0-beta.2
- name: rockpi4
image: ghcr.io/siderolabs/sbc-rockchip:v0.1.0-beta.3
image: ghcr.io/siderolabs/sbc-rockchip:v0.1.0-beta.4
- name: rockpi4c
image: ghcr.io/siderolabs/sbc-rockchip:v0.1.0-beta.3
image: ghcr.io/siderolabs/sbc-rockchip:v0.1.0-beta.4
- name: rock4cplus
image: ghcr.io/siderolabs/sbc-rockchip:v0.1.0-beta.3
image: ghcr.io/siderolabs/sbc-rockchip:v0.1.0-beta.4
- name: rock4se
image: ghcr.io/siderolabs/sbc-rockchip:v0.1.0-beta.3
image: ghcr.io/siderolabs/sbc-rockchip:v0.1.0-beta.4
- name: nanopi-r4s
image: ghcr.io/siderolabs/sbc-rockchip:v0.1.0-beta.3
image: ghcr.io/siderolabs/sbc-rockchip:v0.1.0-beta.4
- name: nanopi-r5s
image: ghcr.io/siderolabs/sbc-rockchip:v0.1.0-beta.4
- name: rock64
image: ghcr.io/siderolabs/sbc-rockchip:v0.1.0-beta.3
image: ghcr.io/siderolabs/sbc-rockchip:v0.1.0-beta.4
- name: orangepi-r1-plus-lts
image: ghcr.io/siderolabs/sbc-rockchip:v0.1.0-beta.3
image: ghcr.io/siderolabs/sbc-rockchip:v0.1.0-beta.4
- name: helios64
image: ghcr.io/siderolabs/sbc-rockchip:v0.1.0-beta.3
image: ghcr.io/siderolabs/sbc-rockchip:v0.1.0-beta.4
- name: jetson_nano
image: ghcr.io/siderolabs/sbc-jetson:v0.1.0-beta.1
- name: bananapi_m64
Expand Down

0 comments on commit 7f25263

Please sign in to comment.