Merge branch 'main' into develop

This commit is contained in:
James Cole
2024-01-28 14:28:33 +01:00
3 changed files with 190 additions and 10 deletions

View File

@@ -5,7 +5,9 @@ feature:
issues: issues:
# Post a comment, `{issue-author}` is an optional placeholder # Post a comment, `{issue-author}` is an optional placeholder
comment: | comment: |
Hi there! This is an automatic reply. `Share and enjoy` Hi there!
This is an automatic reply. `Share and enjoy`
This issue has been marked as a feature request. The requested (new) feature will become a part of Firefly III or the data importer in due course. This issue has been marked as a feature request. The requested (new) feature will become a part of Firefly III or the data importer in due course.
@@ -13,11 +15,29 @@ feature:
Thank you for your contributions. Thank you for your contributions.
epic:
issues:
# Post a comment, `{issue-author}` is an optional placeholder
comment: |
Hi there!
This is an automatic reply. `Share and enjoy`
This issue has been marked as an epic. In epics, large amounts of works are collected that will be part of a major new feature. If you have more ideas that could be a part of this epic, feel free to reply.
*However*, please be aware there is NO need to reply with "+1" or "me too" or "I need this too" or whatever. Such comments are not helpful, and do not influence [the roadmap](https://roadmap.firefly-iii.org/). Your comment may be :skull: deleted.
If you are merely interested in this epic's progress, you can subscribe to this issue to get updates.
Thank you for your contributions.
enhancement: enhancement:
issues: issues:
# Post a comment, `{issue-author}` is an optional placeholder # Post a comment, `{issue-author}` is an optional placeholder
comment: | comment: |
Hi there! This is an automatic reply. `Share and enjoy` Hi there!
This is an automatic reply. `Share and enjoy`
This issue has been marked as an enhancement. The requested enhancement to an existing feature will become a part of Firefly III or the data importer in due course. This issue has been marked as an enhancement. The requested enhancement to an existing feature will become a part of Firefly III or the data importer in due course.
@@ -25,12 +45,13 @@ enhancement:
Thank you for your contributions. Thank you for your contributions.
# The `solved` label is added to discussions
triage: triage:
issues: issues:
# Post a comment, `{issue-author}` is an optional placeholder # Post a comment, `{issue-author}` is an optional placeholder
comment: | comment: |
Hi there! This is an automatic reply. `Share and enjoy` Hi there!
This is an automatic reply. `Share and enjoy`
This issue has been marked as being in triage. The root cause is not known yet, or the issue needs more investigation. You can help by sharing debug information (from `/debug`) if you also have this issue or when you haven't already done so. This issue has been marked as being in triage. The root cause is not known yet, or the issue needs more investigation. You can help by sharing debug information (from `/debug`) if you also have this issue or when you haven't already done so.
@@ -39,13 +60,14 @@ triage:
needs-moar-debug: needs-moar-debug:
issues: issues:
comment: | comment: |
Hi there! This is an automatic reply. `Share and enjoy` Hi there!
To learn more about this issue, please share the output of the `/debug` page of your Firefly III installation. This is an automatic reply. `Share and enjoy`
If this page is no available due to the issue you have, please make sure you share at least: To learn more about this issue, please make sure you share at least:
1. Firefly III version 1. The table you can find on the `/debug` page
2. Firefly III version
2. Docker, self-hosted, or hosted by a third party? 2. Docker, self-hosted, or hosted by a third party?
3. Operating system and browser 3. Operating system and browser
@@ -56,7 +78,9 @@ needs-moar-debug:
needs-moar-logs: needs-moar-logs:
issues: issues:
comment: | comment: |
Hi there! This is an automatic reply. `Share and enjoy` Hi there!
This is an automatic reply. `Share and enjoy`
To learn more about this issue, please share the relevant log files from your Firefly III or data importer installation. To learn more about this issue, please share the relevant log files from your Firefly III or data importer installation.
@@ -70,7 +94,9 @@ needs-moar-logs:
v2-layout-issue: v2-layout-issue:
issues: issues:
comment: | comment: |
Hi there! This is an automatic reply. `Share and enjoy` Hi there!
This is an automatic reply. `Share and enjoy`
It seems your issue is about the new v2-layout that is currently in development for Firefly III. It seems your issue is about the new v2-layout that is currently in development for Firefly III.

View File

@@ -62,6 +62,7 @@ jobs:
'depsreview.yml', 'depsreview.yml',
'label-actions.yml', 'label-actions.yml',
'lock.yml', 'lock.yml',
'release.yml',
'sonarcloud.yml', 'sonarcloud.yml',
'stale.yml' 'stale.yml'
] ]

153
.github/workflows/release.yml vendored Normal file
View File

@@ -0,0 +1,153 @@
name: 'Code - Create new release'
on:
workflow_dispatch:
inputs:
version:
description: 'Version to release'
required: true
default: 'develop'
schedule:
- cron: '30 2 * * *'
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Switch branch
run: |
if [[ "develop" == "$version" ]]; then
git checkout --track origin/develop
git pull
else
git config user.name github-actions
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
git checkout --track origin/develop
git pull
git checkout main
git merge develop
fi
env:
version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.3'
extensions: mbstring, intl, zip, bcmath
- name: crowdin action
uses: crowdin/github-action@v1
with:
upload_sources: true
download_translations: true
push_translations: false
push_sources: false
env:
GITHUB_TOKEN: ${{ github.token }}
CROWDIN_PROJECT_NR: ${{ secrets.CROWDIN_PROJECT_NR }}
CROWDIN_TOKEN: ${{ secrets.CROWDIN_TOKEN }}
- name: Cleanup translations
id: cleanup-transactions
uses: JC5/firefly-iii-dev@v16
with:
action: 'ff3:crowdin-warning'
output: ''
env:
FIREFLY_III_ROOT: /github/workspace
GH_TOKEN: ${{ secrets.GH_TOKEN }}
- name: Cleanup changelog
id: cleanup-changelog
uses: JC5/firefly-iii-dev@v16
with:
action: 'ff3:changelog'
output: ''
env:
FIREFLY_III_ROOT: /github/workspace
GH_TOKEN: ${{ secrets.GH_TOKEN }}
- name: Generate JSON v1
id: json-v1
uses: JC5/firefly-iii-dev@v16
with:
action: 'ff3:json-translations v1'
output: ''
env:
FIREFLY_III_ROOT: /github/workspace
GH_TOKEN: ${{ secrets.GH_TOKEN }}
- name: Generate JSON v2
id: json-v2
uses: JC5/firefly-iii-dev@v16
with:
action: 'ff3:json-translations v2'
output: ''
env:
FIREFLY_III_ROOT: /github/workspace
GH_TOKEN: ${{ secrets.GH_TOKEN }}
- name: Code cleanup
id: code-cleanup
uses: JC5/firefly-iii-dev@v16
with:
action: 'ff3:code'
output: ''
env:
FIREFLY_III_ROOT: /github/workspace
GH_TOKEN: ${{ secrets.GH_TOKEN }}
- name: Build new JS
run: |
npm upgrade
npm run build
- name: Build old JS
id: old-js
uses: JC5/firefly-iii-dev@v16
with:
action: 'ff3:old-js'
output: ''
env:
FIREFLY_III_ROOT: /github/workspace
GH_TOKEN: ${{ secrets.GH_TOKEN }}
- name: Run CI
run: |
rm -rf vendor composer.lock
composer validate --strict
composer update --no-dev --no-scripts --no-plugins -q
sudo chown -R runner:docker resources/lang
.ci/phpcs.sh
- name: Release
run: |
git config user.name github-actions
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
git config advice.addIgnoredFile false
if [[ "develop" == "$version" ]]; then
[[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0;
fi
git add -A
git commit -m "Auto commit for release '$version' on $(date +'%Y-%m-%d')" || true
git push
if [[ "develop" == "$version" ]]; then
echo "Create nightly release."
git tag -a $version-$(date +'%Y%m%d') -m "Release '$version' on $(date +'%Y-%m-%d')"
git push origin $version-$(date +'%Y%m%d')
gh release create $version-$(date +'%Y%m%d') -p -t "Nightly develop release $(date +'%Y%m%d')" --verify-tag
else
echo "Create default release."
git tag -a $version -m "Here be changelog"
echo "7"
git push origin $version
echo "8"
gh release create $version --notes-from-tag -t "$version" --verify-tag
echo "9"
git checkout develop
echo "10"
git merge main
echo "11"
git push
echo "12"
fi
env:
GH_TOKEN: ${{ github.token }}
version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}