diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml deleted file mode 100644 index b61d5c9..0000000 --- a/.github/workflows/docs.yaml +++ /dev/null @@ -1,40 +0,0 @@ -name: docs -on: - push: - branches: - - main - -jobs: - deploy: - runs-on: ubuntu-latest - permissions: - contents: write # To push a branch - pages: write # To push to a GitHub Pages site - id-token: write # To update the deployment status - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Install latest mdbook - run: | - tag=$(curl 'https://api.github.com/repos/rust-lang/mdbook/releases/latest' | jq -r '.tag_name') - url="https://github.com/rust-lang/mdbook/releases/download/${tag}/mdbook-${tag}-x86_64-unknown-linux-gnu.tar.gz" - mkdir mdbook - curl -sSL $url | tar -xz --directory=./mdbook - echo `pwd`/mdbook >> $GITHUB_PATH - - name: Build Book - run: | - # This assumes your book is in the root of your repository. - # Just add a `cd` here if you need to change to another directory. - cd docs - mdbook build - - name: Setup Pages - uses: actions/configure-pages@v4 - - name: Upload artifact - uses: actions/upload-pages-artifact@v3 - with: - # Upload entire repository - path: 'docs/book' - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v4 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8e08b7a..b684f77 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -5,10 +5,6 @@ on: tags: - "v*.*.*" -permissions: - contents: read - packages: write - jobs: release: runs-on: ubuntu-latest @@ -21,5 +17,6 @@ jobs: with: go-version-file: go.mod + - uses: ko-build/setup-ko@v0.7 - - run: ko build --bare --tags ${{ github.ref_name }} github.com/apricote/releaser-pleaser/cmd/rp + - run: ko build --bare --tags ${{ github.ref_name }} diff --git a/.github/workflows/releaser-pleaser.yaml b/.github/workflows/releaser-pleaser.yaml index 7fb4b81..e0ce818 100644 --- a/.github/workflows/releaser-pleaser.yaml +++ b/.github/workflows/releaser-pleaser.yaml @@ -22,5 +22,3 @@ jobs: uses: ./ with: token: ${{ secrets.RELEASER_PLEASER_TOKEN }} - extra-files: | - action.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f09b75..19df7c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,36 +5,6 @@ - update version references in any files (#14) -### Bug Fixes - -- **ci**: building release image fails (#21) -- **ci**: ko pipeline permissions (#23) -- **action**: invalid quoting for extra-files arg (#25) - -## [v0.2.0-beta.2](https://github.com/apricote/releaser-pleaser/releases/tag/v0.2.0-beta.2) -### Features - -- update version references in any files (#14) - -### Bug Fixes - -- **ci**: building release image fails (#21) -- **ci**: ko pipeline permissions (#23) - -## [v0.2.0-beta.1](https://github.com/apricote/releaser-pleaser/releases/tag/v0.2.0-beta.1) -### Features - -- update version references in any files (#14) - -### Bug Fixes - -- **ci**: building release image fails (#21) - -## [v0.2.0-beta.0](https://github.com/apricote/releaser-pleaser/releases/tag/v0.2.0-beta.0) -### Features - -- update version references in any files (#14) - ## [v0.1.0](https://github.com/apricote/releaser-pleaser/releases/tag/v0.1.0) ### This is the first release ever, so it also includes a lot of other functionality. diff --git a/action.yml b/action.yml index cbba8d5..9d68042 100644 --- a/action.yml +++ b/action.yml @@ -24,7 +24,7 @@ runs: - run - --forge=github - --branch=${{ inputs.branch }} - - --extra-files=${{ inputs.extra-files }} + - --extra-files="${{ inputs.extra-files }}" env: GITHUB_TOKEN: ${{ inputs.token }} GITHUB_USER: "oauth2" diff --git a/docs/.gitignore b/docs/.gitignore deleted file mode 100644 index 7585238..0000000 --- a/docs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -book diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md deleted file mode 100644 index 7214617..0000000 --- a/docs/SUMMARY.md +++ /dev/null @@ -1,28 +0,0 @@ -# Summary - -[Introduction](introduction.md) - -# Tutorials - -- [Getting started on GitHub](tutorials/github.md) -- [Getting started on GitLab]() - -# Explanation - -- [Release Pull Request](explanation/release-pr.md) - -# Guides - -- [Customizing Release Notes](guides/release-notes.md) -- [Pre-releases](guides/pre-releases.md) -- [Workflow Permissions on GitHub](guides/github-workflow-permissions.md) - -# Reference - -- [Pull Request Options](reference/pr-options.md) -- [GitHub Action](reference/github-action.md) -- [GitLab CI]() - ---- - -[Changelog](changelog.md) diff --git a/docs/book.toml b/docs/book.toml deleted file mode 100644 index c109a67..0000000 --- a/docs/book.toml +++ /dev/null @@ -1,8 +0,0 @@ -[book] -language = "en" -multilingual = false -src = "." -title = "releaser-pleaser" - -[build] -build-dir = "book" diff --git a/docs/changelog.md b/docs/changelog.md deleted file mode 100644 index ff8ce10..0000000 --- a/docs/changelog.md +++ /dev/null @@ -1,3 +0,0 @@ -# Changelog - -{{#include ../CHANGELOG.md:2: }} diff --git a/docs/explanation/release-pr.md b/docs/explanation/release-pr.md deleted file mode 100644 index f043db4..0000000 --- a/docs/explanation/release-pr.md +++ /dev/null @@ -1 +0,0 @@ -# Release Pull Request diff --git a/docs/guides/github-workflow-permissions.md b/docs/guides/github-workflow-permissions.md deleted file mode 100644 index 45b87fb..0000000 --- a/docs/guides/github-workflow-permissions.md +++ /dev/null @@ -1 +0,0 @@ -# Workflow Permissions on GitHub diff --git a/docs/guides/pre-releases.md b/docs/guides/pre-releases.md deleted file mode 100644 index fd2bbf8..0000000 --- a/docs/guides/pre-releases.md +++ /dev/null @@ -1 +0,0 @@ -# Pre-releases diff --git a/docs/guides/release-notes.md b/docs/guides/release-notes.md deleted file mode 100644 index ed1d1e2..0000000 --- a/docs/guides/release-notes.md +++ /dev/null @@ -1 +0,0 @@ -# Customizing Release Notes diff --git a/docs/introduction.md b/docs/introduction.md deleted file mode 100644 index 04ec94d..0000000 --- a/docs/introduction.md +++ /dev/null @@ -1,3 +0,0 @@ -# Introduction - -{{#include ../README.md:2:}} diff --git a/docs/reference/github-action.md b/docs/reference/github-action.md deleted file mode 100644 index 2bc8ce9..0000000 --- a/docs/reference/github-action.md +++ /dev/null @@ -1 +0,0 @@ -# GitHub Action diff --git a/docs/reference/pr-options.md b/docs/reference/pr-options.md deleted file mode 100644 index 6b6ba14..0000000 --- a/docs/reference/pr-options.md +++ /dev/null @@ -1 +0,0 @@ -# Pull Request Options diff --git a/docs/tutorials/github.md b/docs/tutorials/github.md deleted file mode 100644 index c27f953..0000000 --- a/docs/tutorials/github.md +++ /dev/null @@ -1 +0,0 @@ -# GitHub diff --git a/go.mod b/go.mod index 76b6fcb..3be3b4e 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( dario.cat/mergo v1.0.1 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/ProtonMail/go-crypto v1.0.0 // indirect - github.com/cloudflare/circl v1.4.0 // indirect + github.com/cloudflare/circl v1.3.9 // indirect github.com/cyphar/filepath-securejoin v0.3.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/emirpasic/gods v1.18.1 // indirect diff --git a/go.sum b/go.sum index b5f7d57..c43a8f2 100644 --- a/go.sum +++ b/go.sum @@ -13,8 +13,8 @@ github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= -github.com/cloudflare/circl v1.4.0 h1:BV7h5MgrktNzytKmWjpOtdYrf0lkkbF8YMlBGPhJQrY= -github.com/cloudflare/circl v1.4.0/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU= +github.com/cloudflare/circl v1.3.9 h1:QFrlgFYf2Qpi8bSpVPK1HBvWpx16v/1TZivyo7pGuBE= +github.com/cloudflare/circl v1.3.9/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cyphar/filepath-securejoin v0.3.1 h1:1V7cHiaW+C+39wEfpH6XlLBQo3j/PciWFrgfCLS8XrE= github.com/cyphar/filepath-securejoin v0.3.1/go.mod h1:F7i41x/9cBF7lzCrVsYs9fuzwRZm4NQsGTBdpp6mETc= diff --git a/versioning.go b/versioning.go index d18d480..176a28d 100644 --- a/versioning.go +++ b/versioning.go @@ -45,9 +45,6 @@ func SemVerNextVersion(r Releases, versionBump conventionalcommits.VersionBump, case conventionalcommits.MajorVersion: err = next.IncrementMajor() } - if err != nil { - return "", err - } switch nextVersionType { case NextVersionTypeUndefined, NextVersionTypeNormal: @@ -65,6 +62,10 @@ func SemVerNextVersion(r Releases, versionBump conventionalcommits.VersionBump, setPRVersion(&next, nextVersionType.String(), id) } + if err != nil { + return "", err + } + return "v" + next.String(), nil }