From 6f783f7662225c560560778b93561c2f110c5674 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 30 Jan 2024 08:24:08 +0100 Subject: [PATCH 1/7] Update stale.yml Signed-off-by: James Cole --- .github/workflows/stale.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 9e09ac8afe..e412dd4938 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -1,4 +1,4 @@ -name: "Issues - Close stale issues" +name: "Issues - Mark and close stale issues" on: schedule: - cron: "30 1 * * *" @@ -14,21 +14,25 @@ jobs: pull-requests: write # for actions/stale to close stale PRs runs-on: ubuntu-latest steps: - - uses: actions/stale@v6 + - uses: actions/stale@v9 with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: > - Hi there! This is an automatic reply. `Share and enjoy` + Hi there! + + This is an automatic reply. `Share and enjoy` This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. stale-pr-message: > - Hi there! This is an automatic reply. `Share and enjoy` + Hi there! + + This is an automatic reply. `Share and enjoy` This PR has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. days-before-stale: 14 days-before-close: 7 - exempt-issue-labels: 'enhancement,feature,bug,announcement,epic' + exempt-issue-labels: 'enhancement,feature,bug,announcement,epic,triage' From 2886a22f4e11a581ee30c3cd96dac79f5ddea4ae Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 30 Jan 2024 08:27:47 +0100 Subject: [PATCH 2/7] Update dependabot.yml Signed-off-by: James Cole --- .github/dependabot.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 50269b374b..8d18a78293 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,11 +1,16 @@ version: 2 updates: + # Check for updates to GitHub Actions every week + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + # composer updates - package-ecosystem: "composer" directory: "/" # Location of package manifests target-branch: develop - labels: [ "bug" ] versioning-strategy: increase schedule: interval: "weekly" @@ -14,15 +19,6 @@ updates: - package-ecosystem: "npm" directory: "/" target-branch: develop - labels: [ "bug" ] - versioning-strategy: increase - schedule: - interval: "weekly" - - - package-ecosystem: "github-actions" - directory: "/" - target-branch: develop - labels: [ "bug" ] versioning-strategy: increase schedule: interval: "weekly" From e0bbd3a8108401562f4f678d6b89307ac78675a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jan 2024 07:28:16 +0000 Subject: [PATCH 3/7] Bump JC5/firefly-iii-dev from 16 to 29 Bumps [JC5/firefly-iii-dev](https://github.com/jc5/firefly-iii-dev) from 16 to 29. - [Commits](https://github.com/jc5/firefly-iii-dev/compare/v16...v29) --- updated-dependencies: - dependency-name: JC5/firefly-iii-dev dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/release.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c5d389e7f5..32e6983d5a 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@v16 + uses: JC5/firefly-iii-dev@v29 with: action: 'ff3:crowdin-warning' output: '' @@ -60,7 +60,7 @@ jobs: GH_TOKEN: ${{ secrets.GH_TOKEN }} - name: Cleanup changelog id: cleanup-changelog - uses: JC5/firefly-iii-dev@v16 + uses: JC5/firefly-iii-dev@v29 with: action: 'ff3:changelog' output: '' @@ -69,7 +69,7 @@ jobs: GH_TOKEN: ${{ secrets.GH_TOKEN }} - name: Generate JSON v1 id: json-v1 - uses: JC5/firefly-iii-dev@v16 + uses: JC5/firefly-iii-dev@v29 with: action: 'ff3:json-translations v1' output: '' @@ -78,7 +78,7 @@ jobs: GH_TOKEN: ${{ secrets.GH_TOKEN }} - name: Generate JSON v2 id: json-v2 - uses: JC5/firefly-iii-dev@v16 + uses: JC5/firefly-iii-dev@v29 with: action: 'ff3:json-translations v2' output: '' @@ -87,7 +87,7 @@ jobs: GH_TOKEN: ${{ secrets.GH_TOKEN }} - name: Code cleanup id: code-cleanup - uses: JC5/firefly-iii-dev@v16 + uses: JC5/firefly-iii-dev@v29 with: action: 'ff3:code' output: '' @@ -100,7 +100,7 @@ jobs: npm run build - name: Build old JS id: old-js - uses: JC5/firefly-iii-dev@v16 + uses: JC5/firefly-iii-dev@v29 with: action: 'ff3:old-js' output: '' From 9dcf2646586fec0553b4384c8dc758246538eb6f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jan 2024 07:28:21 +0000 Subject: [PATCH 4/7] Bump actions/dependency-review-action from 3 to 4 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 3 to 4. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/depsreview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/depsreview.yml b/.github/workflows/depsreview.yml index cc523f90d1..e51481a069 100644 --- a/.github/workflows/depsreview.yml +++ b/.github/workflows/depsreview.yml @@ -13,4 +13,4 @@ jobs: with: fetch-depth: 0 - name: 'Dependency review' - uses: actions/dependency-review-action@v3 + uses: actions/dependency-review-action@v4 From c808294ca1915bbc93680d8dd772c9f6dc3492fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jan 2024 07:28:25 +0000 Subject: [PATCH 5/7] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/depsreview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/depsreview.yml b/.github/workflows/depsreview.yml index cc523f90d1..76d8c6465d 100644 --- a/.github/workflows/depsreview.yml +++ b/.github/workflows/depsreview.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: 'Checkout repository' - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: 'Dependency review' From a12ff10550baa68755cd2dc1377be5cb1f96a499 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jan 2024 07:28:29 +0000 Subject: [PATCH 6/7] Bump actions/github-script from 6 to 7 Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/cleanup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml index 38043b5e04..dfedc874b6 100644 --- a/.github/workflows/cleanup.yml +++ b/.github/workflows/cleanup.yml @@ -12,7 +12,7 @@ jobs: timeout-minutes: 10 steps: - name: Prune cancelled/skipped runs - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: github-token: ${{ secrets.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }} script: | @@ -42,7 +42,7 @@ jobs: } - name: Prune runs older than 3 days - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: github-token: ${{ secrets.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }} script: | From 353c345d9a948f8c7545125cb61161af5a1d9d49 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 31 Jan 2024 06:38:36 +0100 Subject: [PATCH 7/7] Updated release script. --- .github/workflows/release.yml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 32e6983d5a..496f2271c3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,6 +67,15 @@ jobs: env: FIREFLY_III_ROOT: /github/workspace GH_TOKEN: ${{ secrets.GH_TOKEN }} + - name: Extract changelog + id: extract-changelog + uses: JC5/firefly-iii-dev@v29 + with: + action: 'ff3:extract-changelog' + output: 'output' + env: + FIREFLY_III_ROOT: /github/workspace + GH_TOKEN: ${{ secrets.GH_TOKEN }} - name: Generate JSON v1 id: json-v1 uses: JC5/firefly-iii-dev@v29 @@ -126,19 +135,25 @@ jobs: fi git add -A + if test -f "output.txt"; then + git reset output.txt + fi 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 tag -a $version-$(date +'%Y%m%d') -m "Nightly development 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 dev-release $(date +'%Y-%m-%d')" --verify-tag + gh release create $version-$(date +'%Y%m%d') -p --verify-tag \ + -t "Development release for $(date +'%Y-%m-%d')" \ + -n "Bi-weekly development release of Firefly III with the latest fixes, translations and features. This release was created on **$(date +'%Y-%m-%d')** and may contain bugs. Use at your own risk. Docker users can find this release under the `develop` tag." else echo "Create default release." git tag -a $version -m "Here be changelog" git push origin $version - gh release create $version --notes-from-tag -t "$version" --verify-tag + gh release create $version -F output.txt -t "$version" --verify-tag + rm -f output.txt git checkout develop git merge main git push