kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 16:57:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into develop

Browse Source 
# Conflicts:
#	.github/workflows/release.yml
This commit is contained in:
James Cole
2025-08-13 07:54:44 +02:00
parent d762136e0b 2b76c4801f
commit a732ce2a20
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/release.yml vendored
View File

@@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v5
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Import GPG key - name: Import GPG key
@@ -233,15 +233,6 @@ jobs:
git push git push
env: env:
version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }} version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
- name: Extract changelog
id: extract-changelog
uses: JC5/firefly-iii-dev@main
with:
action: 'ff3:extract-changelog'
output: 'output'
env:
FIREFLY_III_ROOT: /github/workspace
GH_TOKEN: ""
- name: Generate release description - name: Generate release description
id: release-description id: release-description
uses: JC5/firefly-iii-dev@main uses: JC5/firefly-iii-dev@main
@@ -251,11 +242,6 @@ jobs:
env: env:
FIREFLY_III_ROOT: /github/workspace FIREFLY_III_ROOT: /github/workspace
GH_TOKEN: "" GH_TOKEN: ""
- name: Describe new release
run: |
echo "Should have nothing to do here, but just in case."
env:
version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
- name: Merge all into working branch - name: Merge all into working branch
run: | run: |
MERGE_INTO=develop MERGE_INTO=develop