From 54b2d02f636a35260c53237f6b25b93497412e67 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 7 Apr 2024 10:31:24 +0200 Subject: [PATCH 1/2] Build JS in one go. --- .github/workflows/release.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c95669a586..e68d6abafc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -113,20 +113,12 @@ jobs: env: FIREFLY_III_ROOT: /github/workspace GH_TOKEN: '' - - name: Build new JS + - name: Build JS run: | npm install npm update - npm run build - - name: Build old JS - id: old-js - uses: JC5/firefly-iii-dev@v37 - with: - action: 'ff3:old-js' - output: '' - env: - FIREFLY_III_ROOT: /github/workspace - GH_TOKEN: '' + npm run prod --workspace=v1 + npm run build --workspace=v2 - name: Run CI run: | rm -rf vendor composer.lock From 1238df8784fd7bfa4a3ee9c8c2c7562335428c41 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 7 Apr 2024 10:38:17 +0200 Subject: [PATCH 2/2] Switch to v38 --- .github/workflows/release.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e68d6abafc..543776e39a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,7 +51,7 @@ jobs: CROWDIN_TOKEN: ${{ secrets.CROWDIN_TOKEN }} - name: Cleanup translations id: cleanup-transactions - uses: JC5/firefly-iii-dev@v37 + uses: JC5/firefly-iii-dev@v38 with: action: 'ff3:crowdin-warning' output: '' @@ -60,7 +60,7 @@ jobs: GH_TOKEN: '' - name: Cleanup changelog id: cleanup-changelog - uses: JC5/firefly-iii-dev@v37 + uses: JC5/firefly-iii-dev@v38 with: action: 'ff3:changelog' output: '' @@ -69,7 +69,7 @@ jobs: GH_TOKEN: ${{ secrets.CHANGELOG_TOKEN }} - name: Extract changelog id: extract-changelog - uses: JC5/firefly-iii-dev@v37 + uses: JC5/firefly-iii-dev@v38 with: action: 'ff3:extract-changelog' output: 'output' @@ -78,7 +78,7 @@ jobs: GH_TOKEN: "" - name: Replace version id: replace-version - uses: JC5/firefly-iii-dev@v37 + uses: JC5/firefly-iii-dev@v38 with: action: 'ff3:version' output: '' @@ -88,7 +88,7 @@ jobs: FF_III_VERSION: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }} - name: Generate JSON v1 id: json-v1 - uses: JC5/firefly-iii-dev@v37 + uses: JC5/firefly-iii-dev@v38 with: action: 'ff3:json-translations v1' output: '' @@ -97,7 +97,7 @@ jobs: GH_TOKEN: '' - name: Generate JSON v2 id: json-v2 - uses: JC5/firefly-iii-dev@v37 + uses: JC5/firefly-iii-dev@v38 with: action: 'ff3:json-translations v2' output: '' @@ -106,7 +106,7 @@ jobs: GH_TOKEN: '' - name: Code cleanup id: code-cleanup - uses: JC5/firefly-iii-dev@v37 + uses: JC5/firefly-iii-dev@v38 with: action: 'ff3:code' output: ''