From 0f5fec4c6269c164ddd5fe26b4d71dbaeef93a54 Mon Sep 17 00:00:00 2001 From: Trenton Holmes <797416+stumpylog@users.noreply.github.com> Date: Mon, 10 Jun 2024 09:46:54 -0700 Subject: [PATCH 1/3] Fixes dependabot, updates s6-overlay --- .github/dependabot.yml | 2 ++ CHANGELOG.md | 9 ++++++++- Dockerfile | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 561a102..91ea3df 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -2,9 +2,11 @@ version: 2 updates: - package-ecosystem: "docker" directory: "/" + target-branch: develop schedule: interval: "weekly" - package-ecosystem: "github-actions" directory: "/" + target-branch: develop schedule: interval: "monthly" diff --git a/CHANGELOG.md b/CHANGELOG.md index 178dec2..587d31c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -- Alpine 3.20 +### Changed + +- Base image updated to Alpine 3.20 +- s6-overlay updated to v3.2.0.0 + +### Fixed + +- dependabot was target the wrong branch for updates ## [0.3.0] diff --git a/Dockerfile b/Dockerfile index dc1c6b6..b93f092 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ENV \ ARG TARGETARCH ARG TARGETVARIANT # Lock this version -ARG S6_OVERLAY_VERSION=3.1.6.2 +ARG S6_OVERLAY_VERSION=3.2.0.0 RUN set -eux \ && echo "Installing build time packages" \ From 4f55ba1636a11b1bd621c7d24ca1a0add7921159 Mon Sep 17 00:00:00 2001 From: Trenton Holmes <797416+stumpylog@users.noreply.github.com> Date: Mon, 10 Jun 2024 09:50:32 -0700 Subject: [PATCH 2/3] Adds a release job to generate a new Github release on a tag --- .github/workflows/{build.yml => ci.yml} | 37 ++++++++++++++++++++++--- CHANGELOG.md | 4 +++ 2 files changed, 37 insertions(+), 4 deletions(-) rename .github/workflows/{build.yml => ci.yml} (62%) diff --git a/.github/workflows/build.yml b/.github/workflows/ci.yml similarity index 62% rename from .github/workflows/build.yml rename to .github/workflows/ci.yml index 5d76d2f..f0b75da 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Build Docker Image +name: Build & Release on: push: @@ -11,14 +11,15 @@ on: - "main" - "develop" -permissions: - contents: read - packages: write + jobs: build-image: name: Buld Docker Image runs-on: ubuntu-latest + permissions: + contents: read + packages: write steps: - name: Checkout @@ -60,3 +61,31 @@ jobs: push: true tags: ${{ steps.docker-meta.outputs.tags }} labels: ${{ steps.docker-meta.outputs.labels }} + create-release: + name: Release + runs-on: ubuntu-latest + if: startsWith(github.ref, 'refs/tags/') + permissions: + contents: write + needs: + - build-image + steps: + - + uses: actions/checkout@v4 + - + name: Get latest release info + id: query-release-info + uses: release-flow/keep-a-changelog-action@v3 + with: + command: query + version: ${{ github.ref_name }} + - + name: Display release info + run: | + echo "Version: ${{ steps.query-release-info.outputs.version }}" + echo "Date: ${{ steps.query-release-info.outputs.release-date }}" + echo "${{ steps.query-release-info.outputs.release-notes }}" + - + uses: ncipollo/release-action@v1 + with: + body: ${{ steps.query-release-info.outputs.release-notes }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 587d31c..87d5a5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Base image updated to Alpine 3.20 - s6-overlay updated to v3.2.0.0 +### Added + +- Github release with changelog for releases + ### Fixed - dependabot was target the wrong branch for updates From 9c3015cd100e2282c3218442172c9ab768d1a56e Mon Sep 17 00:00:00 2001 From: Trenton Holmes <797416+stumpylog@users.noreply.github.com> Date: Mon, 10 Jun 2024 09:52:00 -0700 Subject: [PATCH 3/3] Bumps version to 0.4.0 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87d5a5a..9b98fb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [0.4.0] - 2024-06-10 ### Changed