Skip to content

Commit

Permalink
chore: 🔀 Merge branch 'main' into feature/alternative-pubkey-management
Browse files Browse the repository at this point in the history
  • Loading branch information
AnotherStranger committed Jul 3, 2023
2 parents bc2d276 + fb36e91 commit 07efe6e
Show file tree
Hide file tree
Showing 4 changed files with 111 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ jobs:
- name: Release
env:
GH_TOKEN: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}
run: npx --package @semantic-release/git --package @semantic-release/changelog semantic-release
run: npx --package @semantic-release/git --package @semantic-release/changelog --package conventional-changelog-conventionalcommits semantic-release
16 changes: 15 additions & 1 deletion .releaserc.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,21 @@
[
"@semantic-release/release-notes-generator",
{
"preset": "angular",
"preset": "conventionalcommits",
"presetConfig": {
"types": [
{ "type": "build", "section": "Build System", "hidden": false },
{ "type": "chore", "section": "Build System", "hidden": false },
{ "type": "ci", "section": "Continuous Integration", "hidden": false },
{ "type": "docs", "section": "Documentation", "hidden": false },
{ "type": "feat", "section": "Features", "hidden": false },
{ "type": "fix", "section": "Bug Fixes", "hidden": false },
{ "type": "perf", "section": "Performance Improvements", "hidden": false },
{ "type": "refactor", "section": "Code Refactoring", "hidden": false },
{ "type": "style", "section": "Styles", "hidden": false },
{ "type": "test", "section": "Tests", "hidden": false }
]
},
"releaseRules": [
{
"type": "docs",
Expand Down
92 changes: 92 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,95 @@
## [1.10.3](https://github.com/AnotherStranger/docker-borg-backup/compare/v1.10.2...v1.10.3) (2023-06-19)


### Build System

* **release:** 1.10.3-rc.1 ([df3e4f6](https://github.com/AnotherStranger/docker-borg-backup/commit/df3e4f6d8d7557f85795fa80248690b3fe855bf4))


### Code Refactoring

* **docker:** :arrow_up: update shadow version ([5047252](https://github.com/AnotherStranger/docker-borg-backup/commit/504725267eeeb7f2aec5c5e419cec8a83e05f991))

## [1.10.3-rc.1](https://github.com/AnotherStranger/docker-borg-backup/compare/v1.10.2...v1.10.3-rc.1) (2023-06-19)


### Code Refactoring

* **docker:** :arrow_up: update shadow version ([5047252](https://github.com/AnotherStranger/docker-borg-backup/commit/504725267eeeb7f2aec5c5e419cec8a83e05f991))

## [1.10.2](https://github.com/AnotherStranger/docker-borg-backup/compare/v1.10.1...v1.10.2) (2023-06-14)


### Code Refactoring

* :recycle: add presetConfig for release-notes-generator ([cf96bec](https://github.com/AnotherStranger/docker-borg-backup/commit/cf96bece002266fd842f94ee167ee12789c65445))


### Build System

* **release:** 1.10.1-rc.3 ([710a926](https://github.com/AnotherStranger/docker-borg-backup/commit/710a926a89cfef2d787fbfefc7c60094ececa7e8))
* **release:** 1.10.2-rc.1 ([70dc96a](https://github.com/AnotherStranger/docker-borg-backup/commit/70dc96a77a1f5738bee53cc43fb9e52e1af2a642))
* Merge branch 'dev' of https://github.com/AnotherStranger/docker-borg-backup into dev ([6ff9cba](https://github.com/AnotherStranger/docker-borg-backup/commit/6ff9cba7a7dbbe3fbd39a6f36f3985a965f2d1b4))
* Merge branch 'main' into dev ([50b1442](https://github.com/AnotherStranger/docker-borg-backup/commit/50b1442a641f4945091fbce43f8876a84f36a857))

## [1.10.2-rc.1](https://github.com/AnotherStranger/docker-borg-backup/compare/v1.10.1...v1.10.2-rc.1) (2023-06-12)


### Code Refactoring

* :recycle: add presetConfig for release-notes-generator ([cf96bec](https://github.com/AnotherStranger/docker-borg-backup/commit/cf96bece002266fd842f94ee167ee12789c65445))


### Build System

* **release:** 1.10.1-rc.3 ([710a926](https://github.com/AnotherStranger/docker-borg-backup/commit/710a926a89cfef2d787fbfefc7c60094ececa7e8))
* Merge branch 'dev' of https://github.com/AnotherStranger/docker-borg-backup into dev ([6ff9cba](https://github.com/AnotherStranger/docker-borg-backup/commit/6ff9cba7a7dbbe3fbd39a6f36f3985a965f2d1b4))
* Merge branch 'main' into dev ([50b1442](https://github.com/AnotherStranger/docker-borg-backup/commit/50b1442a641f4945091fbce43f8876a84f36a857))

## [1.10.2-rc.1](https://github.com/AnotherStranger/docker-borg-backup/compare/v1.10.1-rc.2...v1.10.1-rc.3) (2023-06-12)


### Code Refactoring

* :recycle: add presetConfig for release-notes-generator ([cf96bec](https://github.com/AnotherStranger/docker-borg-backup/commit/cf96bece002266fd842f94ee167ee12789c65445))


### Build System

* Merge branch 'dev' of https://github.com/AnotherStranger/docker-borg-backup into dev ([6ff9cba](https://github.com/AnotherStranger/docker-borg-backup/commit/6ff9cba7a7dbbe3fbd39a6f36f3985a965f2d1b4))

## [1.10.1](https://github.com/AnotherStranger/docker-borg-backup/compare/v1.10.0...v1.10.1) (2023-06-12)


### Bug Fixes

* :bug: add missing package in release ([9af1937](https://github.com/AnotherStranger/docker-borg-backup/commit/9af1937e3af250dcd2f38fc7b3732f7d399f4f67))
* **ci:** :bug: Disable build cache to force base image pull ([672e4f4](https://github.com/AnotherStranger/docker-borg-backup/commit/672e4f49b1845d4e56e1f4314d1a2315026f6ede))


### Reverts

* Revert "fix(ci): :bug: Disable build cache to force base image pull" ([6a6f0bf](https://github.com/AnotherStranger/docker-borg-backup/commit/6a6f0bf9ada405f3b8b09f7494144190d7e4160f))

## [1.10.1-rc.2](https://github.com/AnotherStranger/docker-borg-backup/compare/v1.10.1-rc.1...v1.10.1-rc.2) (2023-06-12)


### Bug Fixes

* :bug: add missing package in release ([9af1937](https://github.com/AnotherStranger/docker-borg-backup/commit/9af1937e3af250dcd2f38fc7b3732f7d399f4f67))

## [1.10.1-rc.1](https://github.com/AnotherStranger/docker-borg-backup/compare/v1.10.0...v1.10.1-rc.1) (2023-06-12)


### Bug Fixes

* **ci:** :bug: Disable build cache to force base image pull ([672e4f4](https://github.com/AnotherStranger/docker-borg-backup/commit/672e4f49b1845d4e56e1f4314d1a2315026f6ede))


### Reverts

* Revert "fix(ci): :bug: Disable build cache to force base image pull" ([6a6f0bf](https://github.com/AnotherStranger/docker-borg-backup/commit/6a6f0bf9ada405f3b8b09f7494144190d7e4160f))

# [1.10.0](https://github.com/AnotherStranger/docker-borg-backup/compare/v1.9.3...v1.10.0) (2023-05-17)


Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ ARG BORGBACKUP_VERSION="1.2.4"
ARG PYTHON_VERSION="3.11"
ARG OPENSSH_VERSION="9.3_p1-r3"
ARG SED_VERSION="4.9-r2"
ARG BASH_VERSION="5.2.15-r3"
ARG SHADOW_VERSION="4.13-r2"
ARG OPENSSL_VERSION="3.1.0-r4"
ARG BASH_VERSION="5.2.15-r5"
ARG SHADOW_VERSION="4.13-r4"
ARG OPENSSL_VERSION="3.1.1-r1"
ARG PKG_CONF_VERSION="1.9.5-r0"
ARG GCC_VERSION="12.2.1_git20220924-r10"
ARG MUSL_VERSION="1.2.4-r0"
Expand Down

0 comments on commit 07efe6e

Please sign in to comment.