From 15a683428278f8bf1b7c46110e6cb72d417ad1b8 Mon Sep 17 00:00:00 2001 From: Noel Georgi Date: Mon, 2 Dec 2024 18:25:25 +0530 Subject: [PATCH] chore: bump deps Bump deps. Signed-off-by: Noel Georgi --- .github/renovate.json | 6 ++ .github/workflows/ci.yaml | 4 +- .github/workflows/slack-notify.yaml | 10 +-- .kres.yaml | 2 +- Makefile | 15 ++++- Pkgfile | 8 +-- artifacts/raspberrypi-firmware/pkg.yaml | 6 +- hack/release.sh | 89 ++++++++++++++++++++++++- installers/rpi_generic/src/go.mod | 4 +- installers/rpi_generic/src/go.sum | 4 +- 10 files changed, 124 insertions(+), 24 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 84f5e13..4ce7469 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -38,6 +38,12 @@ ], "versioning": "regex:^(?\\d+)\\.(?\\d+)\\.?(?\\d+)?$" }, + { + "matchPackageNames": [ + "raspberrypi/firmware" + ], + "versioning": "regex:^\\d+\\.(?\\d{4})(?\\d{2})(?\\d{2})$" + }, { "matchPackagePatterns": [ "*" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6a958dc..6ec6ecf 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-08T11:41:42Z by kres dbf015a. +# Generated on 2024-12-02T12:55:03Z by kres 232fe63. 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.17.2 options: --privileged ports: - 1234:1234 diff --git a/.github/workflows/slack-notify.yaml b/.github/workflows/slack-notify.yaml index 0aa63c2..8097c24 100644 --- a/.github/workflows/slack-notify.yaml +++ b/.github/workflows/slack-notify.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-03-01T09:58:00Z by kres 38f172c. +# Generated on 2024-12-02T12:55:03Z by kres 232fe63. name: slack-notify "on": @@ -24,11 +24,12 @@ jobs: run: | echo pull_request_number=$(gh pr view -R ${{ github.repository }} ${{ github.event.workflow_run.head_repository.owner.login }}:${{ github.event.workflow_run.head_branch }} --json number --jq .number) >> $GITHUB_OUTPUT - name: Slack Notify - uses: slackapi/slack-github-action@v1 + uses: slackapi/slack-github-action@v2 with: - channel-id: proj-talos-maintainers + method: chat.postMessage payload: | { + "channel": "proj-talos-maintainers", "attachments": [ { "color": "${{ github.event.workflow_run.conclusion == 'success' && '#2EB886' || github.event.workflow_run.conclusion == 'failure' && '#A30002' || '#FFCC00' }}", @@ -88,5 +89,4 @@ jobs: } ] } - env: - SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} + token: ${{ secrets.SLACK_BOT_TOKEN }} diff --git a/.kres.yaml b/.kres.yaml index 0132aa6..dab20bd 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -11,7 +11,7 @@ spec: - name: PKGS_PREFIX defaultValue: ghcr.io/siderolabs - name: PKGS - defaultValue: v1.8.0-alpha.0-46-g124d35b + defaultValue: v1.9.0-1-gb047e41 --- kind: common.Build spec: diff --git a/Makefile b/Makefile index 4594aea..04abc95 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-08-08T11:54:48Z by kres dbf015a. +# Generated on 2024-12-02T12:55:03Z by kres 232fe63. # common variables @@ -36,18 +36,20 @@ PLATFORM ?= linux/amd64,linux/arm64 PROGRESS ?= auto PUSH ?= false CI_ARGS ?= +BUILDKIT_MULTI_PLATFORM ?= 1 COMMON_ARGS = --file=Pkgfile COMMON_ARGS += --provenance=false COMMON_ARGS += --progress=$(PROGRESS) COMMON_ARGS += --platform=$(PLATFORM) COMMON_ARGS += --build-arg=SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) +COMMON_ARGS += --build-arg=BUILDKIT_MULTI_PLATFORM=$(BUILDKIT_MULTI_PLATFORM) COMMON_ARGS += --build-arg=PKGS_PREFIX="$(PKGS_PREFIX)" COMMON_ARGS += --build-arg=PKGS="$(PKGS)" # extra variables PKGS_PREFIX ?= ghcr.io/siderolabs -PKGS ?= v1.8.0-alpha.0-46-g124d35b +PKGS ?= v1.9.0-1-gb047e41 # targets defines all the available targets @@ -117,6 +119,15 @@ target-%: ## Builds the specified target defined in the Pkgfile. The build resu local-%: ## Builds the specified target defined in the Pkgfile using the local output type. The build result will be output to the specified local destination. @$(MAKE) target-$* TARGET_ARGS="--output=type=local,dest=$(DEST) $(TARGET_ARGS)" + @PLATFORM=$(PLATFORM) DEST=$(DEST) bash -c '\ + for platform in $$(tr "," "\n" <<< "$$PLATFORM"); do \ + echo $$platform; \ + directory="$${platform//\//_}"; \ + if [[ -d "$$DEST/$$directory" ]]; then \ + mv "$$DEST/$$directory/"* $$DEST; \ + rmdir "$$DEST/$$directory/"; \ + fi; \ + done' docker-%: ## Builds the specified target defined in the Pkgfile using the docker output type. The build result will be loaded into Docker. @$(MAKE) target-$* TARGET_ARGS="$(TARGET_ARGS)" diff --git a/Pkgfile b/Pkgfile index 898dfd2..6f22b29 100644 --- a/Pkgfile +++ b/Pkgfile @@ -3,10 +3,10 @@ format: v1alpha2 vars: - # renovate: datasource=git-refs versioning=git depName=https://github.com/raspberrypi/firmware.git - raspberrypi_firmware_ref: c276eae28a20ac7d36c533fe3a120f7679690882 - raspberrypi_firmware_sha256: 28ca93effaea99fe2b5cd0e5daf02b30767dc77f8ce395457139766be4ac6917 - raspberrypi_firmware_sha512: 500ba9bc5afb9e921b68c2c7642e8bd133470241cfb358df9cf9a87c6796b87c312980fc15105f95af811df3b1950324a24fb43cd34b765e41653af382daa97d + # renovate: datasource=github-tags depName=raspberrypi/firmware + raspberrypi_firmware_version: 1.20241126 + raspberrypi_firmware_sha256: 020dbcdbb30af5942a62fc3eb355449aba45276b67e864dee2522ff53fd936e6 + raspberrypi_firmware_sha512: 7860a7a913a35313031e07295a2c8b40b6f0e97523abf8053f0d792106dde53332755c7ab3bbe2a08b7817f77b11242637c1b0520bfb6d2d58642f6e9c4d1a52 # renovate: datasource=github-tags extractVersion=^v(?.*)$ depName=u-boot/u-boot uboot_version: 2024.07 diff --git a/artifacts/raspberrypi-firmware/pkg.yaml b/artifacts/raspberrypi-firmware/pkg.yaml index 0f8566b..efe12ca 100644 --- a/artifacts/raspberrypi-firmware/pkg.yaml +++ b/artifacts/raspberrypi-firmware/pkg.yaml @@ -5,13 +5,13 @@ dependencies: - stage: base steps: - sources: - - url: https://github.com/raspberrypi/firmware/archive/{{ .raspberrypi_firmware_ref }}.tar.gz - destination: raspberrypi-firmware.tar.gz + - url: https://github.com/raspberrypi/firmware/releases/download/{{ .raspberrypi_firmware_version }}/raspi-firmware_{{ .raspberrypi_firmware_version }}.orig.tar.xz + destination: raspberrypi-firmware.tar.xz sha256: "{{ .raspberrypi_firmware_sha256 }}" sha512: "{{ .raspberrypi_firmware_sha512 }}" prepare: - | - tar -xzf raspberrypi-firmware.tar.gz --strip-components=1 + tar xf raspberrypi-firmware.tar.xz --strip-components=1 install: - | mkdir -p /rootfs/artifacts/arm64/firmware/boot diff --git a/hack/release.sh b/hack/release.sh index 0a2da38..e9ffcff 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-01T15:00:03Z by kres b661666. +# Generated on 2024-12-02T12:55:03Z by kres 232fe63. 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 <