Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .cruft.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"template": "https://github.com/vshn/appcat-cookiecutter",
"commit": "725bf3a6fc6bd3729f02fd25dd04d93af597fdda",
"commit": "8f29fab7ec7458dacdc42e208806c5669162d87f",
"checkout": null,
"context": {
"cookiecutter": {
Expand All @@ -15,7 +15,7 @@
".github/changelog-configuration.json"
],
"_template": "https://github.com/vshn/appcat-cookiecutter",
"_commit": "725bf3a6fc6bd3729f02fd25dd04d93af597fdda"
"_commit": "8f29fab7ec7458dacdc42e208806c5669162d87f"
}
},
"directory": null
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ env:
jobs:
create-and-merge-appcat-pr:
runs-on: ubuntu-latest
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
outputs:
new_tag: ${{ steps.bump.outputs.new_tag }}
steps:
Expand Down Expand Up @@ -70,7 +72,7 @@ jobs:
- name: Merge PR
run: gh pr merge ${{ steps.pr_info.outputs.pr_number }} --merge
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ secrets.MERGE_TOKEN }}

- name: Bump minor version and tag
id: bump
Expand All @@ -87,6 +89,8 @@ jobs:
create-component-release-pr:
needs: create-and-merge-appcat-pr
runs-on: ubuntu-latest
env:
GH_TOKEN: ${{ secrets.COMPONENT_ACCESS_TOKEN }}
steps:
- name: Clone component repo
uses: actions/checkout@v4
Expand Down
Loading