Compare commits

...

2 Commits

Author SHA1 Message Date
CI a9b300d711 release v1.1.1 [skip ci] 2026-04-15 03:03:37 +00:00
keligrubb fded3a04d4 ci: split push release/publish and harden workflows (#27)
Push / release (push) Successful in 47s
Push / publish (push) Successful in 1m0s
### Added
* Separate release from Docker/Helm publish
* enrich releases with PRbodies when available
* tighten release.sh validation and idempotency
* trim PR docker-build metadata for act-runner stability

Reviewed-on: #27
Co-authored-by: keligrubb <keligrubb324@gmail.com>
Co-committed-by: keligrubb <keligrubb324@gmail.com>
2026-04-15 03:03:04 +00:00
7 changed files with 61 additions and 10 deletions
+7
View File
@@ -79,7 +79,14 @@ jobs:
- name: Build (dry run) - name: Build (dry run)
uses: https://git.keligrubb.com/actions/docker-build-push-action@v7 uses: https://git.keligrubb.com/actions/docker-build-push-action@v7
env:
# Keeps GITHUB_OUTPUT small; Gitea act-runner can choke on multiline
# outputs when PR webhook payloads (e.g. Renovate bodies) are huge.
DOCKER_BUILD_SUMMARY: "false"
DOCKER_BUILD_RECORD_UPLOAD: "false"
with: with:
context: . context: .
push: false push: false
provenance: false
sbom: false
tags: ${{ steps.image.outputs.tag }} tags: ${{ steps.image.outputs.tag }}
+31 -4
View File
@@ -5,13 +5,25 @@ on:
branches: [main] branches: [main]
jobs: jobs:
release-docker-helm: release:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: https://git.keligrubb.com/actions/checkout@v6 - uses: https://git.keligrubb.com/actions/checkout@v6
with: with:
token: ${{ secrets.KESTRELOS_REPO_TOKEN }} token: ${{ secrets.KESTRELOS_REPO_TOKEN }}
- name: Get PR description for changelog
env:
GITEA_REPO_TOKEN: ${{ secrets.KESTRELOS_REPO_TOKEN }}
run: |
sudo rm -f /etc/apt/sources.list.d/microsoft*.list /etc/apt/sources.list.d/azure*.list 2>/dev/null || true
sudo apt-get update -qq && sudo apt-get install -y -qq jq
RESP=$(curl -sf -H "Authorization: token $GITEA_REPO_TOKEN" \
"${{ github.server_url }}/api/v1/repos/${{ github.repository }}/commits/${{ github.sha }}/pull") || true
if [ -n "$RESP" ]; then
echo "$RESP" | jq -r '.body // empty' > .ci_pr_body 2>/dev/null || true
fi
- name: Release (bump, tag, push, create release) - name: Release (bump, tag, push, create release)
env: env:
CI_REPO_OWNER: ${{ github.actor }} CI_REPO_OWNER: ${{ github.actor }}
@@ -20,9 +32,19 @@ jobs:
CI_COMMIT_MESSAGE: ${{ github.event.head_commit.message }} CI_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
GITEA_REPO_TOKEN: ${{ secrets.KESTRELOS_REPO_TOKEN }} GITEA_REPO_TOKEN: ${{ secrets.KESTRELOS_REPO_TOKEN }}
run: | run: |
sudo rm -f /etc/apt/sources.list.d/microsoft*.list /etc/apt/sources.list.d/azure*.list 2>/dev/null || true
sudo apt-get update -qq && sudo apt-get install -y -qq git wget sudo apt-get update -qq && sudo apt-get install -y -qq git wget
./scripts/release.sh ./scripts/release.sh
publish:
needs: release
runs-on: ubuntu-latest
steps:
- uses: https://git.keligrubb.com/actions/checkout@v6
with:
ref: main
token: ${{ secrets.KESTRELOS_REPO_TOKEN }}
- name: Log in to container registry - name: Log in to container registry
uses: https://git.keligrubb.com/actions/docker-login-action@v4 uses: https://git.keligrubb.com/actions/docker-login-action@v4
with: with:
@@ -40,14 +62,19 @@ jobs:
load: true load: true
tags: kestrelos:built tags: kestrelos:built
- name: Push Docker image (all tags from .tags) - name: Push Docker image (version + latest)
run: | run: |
VERSION=$(awk '/"version"/ { match($0, /[0-9]+\.[0-9]+\.[0-9]+/); print substr($0, RSTART, RLENGTH); exit }' package.json)
case "$VERSION" in
[0-9]*.[0-9]*.[0-9]*) ;;
*) echo "error: package.json version must be x.y.z (got: $VERSION)"; exit 1 ;;
esac
REGISTRY="git.keligrubb.com" REGISTRY="git.keligrubb.com"
IMAGE="$REGISTRY/${{ github.repository }}" IMAGE="$REGISTRY/${{ github.repository }}"
while read -r tag; do for tag in "$VERSION" latest; do
docker tag kestrelos:built "$IMAGE:$tag" docker tag kestrelos:built "$IMAGE:$tag"
docker push "$IMAGE:$tag" docker push "$IMAGE:$tag"
done < .tags done
- name: Set up Helm - name: Set up Helm
uses: https://git.keligrubb.com/actions/setup-helm@v5 uses: https://git.keligrubb.com/actions/setup-helm@v5
+10
View File
@@ -1,3 +1,13 @@
## [1.1.1] - 2026-04-15
### Changed
- split push release/publish and harden workflows (#27)
### Added
* Separate release from Docker/Helm publish
* enrich releases with PRbodies when available
* tighten release.sh validation and idempotency
* trim PR docker-build metadata for act-runner stability
## [1.1.0] - 2026-04-15 ## [1.1.0] - 2026-04-15
### Changed ### Changed
- Update all non-major dependencies (#25) - Update all non-major dependencies (#25)
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: kestrelos name: kestrelos
description: KestrelOS TOC for OSINT feeds - map, camera feeds, offline tiles description: KestrelOS TOC for OSINT feeds - map, camera feeds, offline tiles
type: application type: application
version: 1.1.0 version: 1.1.1
appVersion: "1.1.0" appVersion: "1.1.1"
+1 -1
View File
@@ -2,7 +2,7 @@ replicaCount: 1
image: image:
repository: git.keligrubb.com/keligrubb/kestrelos repository: git.keligrubb.com/keligrubb/kestrelos
tag: 1.1.0 tag: 1.1.1
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
service: service:
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "kestrelos", "name": "kestrelos",
"version": "1.1.0", "version": "1.1.1",
"private": true, "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {
+9 -2
View File
@@ -20,10 +20,18 @@ echo "$msg" | grep -Eqi '(^|[[:space:]])[a-zA-Z]+(\([^)]*\))?!:' && bump=major
echo "$msg" | grep -qi minor: && [ "$bump" != "major" ] && bump=minor echo "$msg" | grep -qi minor: && [ "$bump" != "major" ] && bump=minor
echo "$msg" | grep -qi major: && bump=major echo "$msg" | grep -qi major: && bump=major
cur=$(awk '/"version"/ { match($0, /[0-9]+\.[0-9]+\.[0-9]+/); print substr($0, RSTART, RLENGTH); exit }' package.json) cur=$(awk '/"version"/ { match($0, /[0-9]+\.[0-9]+\.[0-9]+/); print substr($0, RSTART, RLENGTH); exit }' package.json)
case "$cur" in
[0-9]*.[0-9]*.[0-9]*) ;;
*) echo "error: package.json version must be x.y.z (got: $cur)"; exit 1 ;;
esac
major=$(echo "$cur" | cut -d. -f1); minor=$(echo "$cur" | cut -d. -f2); patch=$(echo "$cur" | cut -d. -f3) major=$(echo "$cur" | cut -d. -f1); minor=$(echo "$cur" | cut -d. -f2); patch=$(echo "$cur" | cut -d. -f3)
case "$bump" in major) major=$((major+1)); minor=0; patch=0 ;; minor) minor=$((minor+1)); patch=0 ;; patch) patch=$((patch+1)) ;; esac case "$bump" in major) major=$((major+1)); minor=0; patch=0 ;; minor) minor=$((minor+1)); patch=0 ;; patch) patch=$((patch+1)) ;; esac
newVersion="$major.$minor.$patch" newVersion="$major.$minor.$patch"
[ -z "$cur" ] && { echo "error: could not read version from package.json"; exit 1; }
url="https://${CI_REPO_OWNER}:${GITEA_REPO_TOKEN}@${CI_FORGE_URL#https://}/${CI_REPO_OWNER}/${CI_REPO_NAME}.git"
if [ -n "$(git ls-remote "$url" "refs/tags/v$newVersion" 2>/dev/null)" ]; then
exit 0
fi
# changelog entry (strip explicit bump prefixes & any conventional-commit type(scope):); optional PR description enriches it # changelog entry (strip explicit bump prefixes & any conventional-commit type(scope):); optional PR description enriches it
changelogEntry=$( changelogEntry=$(
@@ -59,7 +67,6 @@ $changelogFull
git config user.email "ci@kestrelos" && git config user.name "CI" git config user.email "ci@kestrelos" && git config user.name "CI"
git add package.json helm/kestrelos/Chart.yaml helm/kestrelos/values.yaml CHANGELOG.md git add package.json helm/kestrelos/Chart.yaml helm/kestrelos/values.yaml CHANGELOG.md
git commit -m "release v$newVersion [skip ci]" git commit -m "release v$newVersion [skip ci]"
url="https://${CI_REPO_OWNER}:${GITEA_REPO_TOKEN}@${CI_FORGE_URL#https://}/${CI_REPO_OWNER}/${CI_REPO_NAME}.git"
git tag "v$newVersion" git tag "v$newVersion"
# artifact for docker (tag list) # artifact for docker (tag list)
printf '%s\n%s\n' "$newVersion" "latest" > .tags printf '%s\n%s\n' "$newVersion" "latest" > .tags