Skip to content

Commit

Permalink
Merge branch 'release/0.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
stumpylog committed Jun 10, 2024
2 parents e70a781 + 9c3015c commit b5a20d2
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
37 changes: 33 additions & 4 deletions .github/workflows/build.yml → .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build Docker Image
name: Build & Release

on:
push:
Expand All @@ -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
Expand Down Expand Up @@ -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 }}
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,20 @@ 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

- Alpine 3.20
### Changed

- 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

## [0.3.0]

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down

0 comments on commit b5a20d2

Please sign in to comment.