IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-08-17 16:35:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into develop

Browse Source 
# Conflicts:
#	composer.lock
This commit is contained in:
James Cole
2026-06-25 22:42:16 +02:00
parent 311d562d1e 4b80df1f44
commit 53233fc3e2
4 changed files with 265 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/depsreview.yml
+1 -1
View File
@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 'Checkout repository'
uses: actions/checkout@v6
uses: actions/checkout@v7
with:
fetch-depth: 0
- name: 'Dependency review'
.github/workflows/release.yml
+18 -7
View File
@@ -23,21 +23,21 @@ jobs:
# validate argument
if [[ $version != develo* ]] && [[ $version != v* ]] && [[ $version != branch* ]] ;
then
echo "Argument '$version' does not start with a d or with a v or a b"
echo "Argument '$version' does not start with a d or with a v or 'branch'"
exit 1
fi
env:
version: ${{ github.event_name == 'schedule' && 'develop' || inputs.version }}
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7
with:
fetch-depth: 0
- name: Switch and pull
run: |
# validate argument
if [[ $version != d* ]] && [[ $version != v* ]] ;
if [[ $version != develo* ]] && [[ $version != v* ]] && [[ $version != branch* ]] ;
then
echo 'Argument does not start with a d or with a v'
echo "Argument '$version' does not start with a d or with a v or 'branch'"
exit 1
fi
@@ -46,10 +46,11 @@ jobs:
#
BRANCH_TO_PULL=origin/develop
if [[ "$version" == branch* ]]; then
BRANCH_TO_PULL=origin/$version
SHORT=${version:7}
BRANCH_TO_PULL="origin/$SHORT"
fi
echo "Version is '$version', check out '$BRANCH_TO_PULL'-branch"
echo "Version is '$version', check out '$BRANCH_TO_PULL' branch"
git checkout --track $BRANCH_TO_PULL
git pull
@@ -150,11 +151,20 @@ jobs:
env:
FIREFLY_III_ROOT: /github/workspace
GH_TOKEN: ''
- name: Generate JSON v3
id: json-v3
uses: JC5/firefly-iii-dev@main
with:
action: 'ff3:json-translations v3'
output: ''
env:
FIREFLY_III_ROOT: /github/workspace
GH_TOKEN: ''
- name: Build JS
run: |
npm install
npm run prod --workspace=v1 --verbose
npm run build --workspace=v2 --verbose
npm run build --workspace=v3 --verbose || true
npm update
- name: Cleanup changelog
id: cleanup-changelog
@@ -271,6 +281,7 @@ jobs:
GH_TOKEN: ""
- name: Merge all into working branch
run: |
git status
MERGE_INTO=develop
if [[ "$version" == branch* ]]; then
MERGE_INTO=$version
composer.lock
Generated
+228 -400
View File
File diff suppressed because it is too large Load Diff
package-lock.json
Generated
+18
View File
@@ -2351,6 +2351,9 @@
"arm64"
],
"dev": true,
"libc": [
"glibc"
],
"license": "MIT",
"optional": true,
"os": [
@@ -2368,6 +2371,9 @@
"arm64"
],
"dev": true,
"libc": [
"musl"
],
"license": "MIT",
"optional": true,
"os": [
@@ -2385,6 +2391,9 @@
"ppc64"
],
"dev": true,
"libc": [
"glibc"
],
"license": "MIT",
"optional": true,
"os": [
@@ -2402,6 +2411,9 @@
"s390x"
],
"dev": true,
"libc": [
"glibc"
],
"license": "MIT",
"optional": true,
"os": [
@@ -2419,6 +2431,9 @@
"x64"
],
"dev": true,
"libc": [
"glibc"
],
"license": "MIT",
"optional": true,
"os": [
@@ -2436,6 +2451,9 @@
"x64"
],
"dev": true,
"libc": [
"musl"
],
"license": "MIT",
"optional": true,
"os": [