From 89f197b9d48c024c404d36dd85b9b3e193a703ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Dec 2024 01:17:43 +0000 Subject: [PATCH 1/6] Bump league/commonmark in the composer group across 1 directory Bumps the composer group with 1 update in the / directory: [league/commonmark](https://github.com/thephpleague/commonmark). Updates `league/commonmark` from 2.5.3 to 2.6.0 - [Release notes](https://github.com/thephpleague/commonmark/releases) - [Changelog](https://github.com/thephpleague/commonmark/blob/2.6/CHANGELOG.md) - [Commits](https://github.com/thephpleague/commonmark/compare/2.5.3...2.6.0) --- updated-dependencies: - dependency-name: league/commonmark dependency-type: direct:production dependency-group: composer ... Signed-off-by: dependabot[bot] --- composer.lock | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/composer.lock b/composer.lock index 4257fb6ec0..68ed78f936 100644 --- a/composer.lock +++ b/composer.lock @@ -3281,16 +3281,16 @@ }, { "name": "league/commonmark", - "version": "2.5.3", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "b650144166dfa7703e62a22e493b853b58d874b0" + "reference": "d150f911e0079e90ae3c106734c93137c184f932" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0", - "reference": "b650144166dfa7703e62a22e493b853b58d874b0", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d150f911e0079e90ae3c106734c93137c184f932", + "reference": "d150f911e0079e90ae3c106734c93137c184f932", "shasum": "" }, "require": { @@ -3315,8 +3315,9 @@ "phpstan/phpstan": "^1.8.2", "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0", "scrutinizer/ocular": "^1.8.1", - "symfony/finder": "^5.3 | ^6.0 || ^7.0", - "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 || ^7.0", + "symfony/finder": "^5.3 | ^6.0 | ^7.0", + "symfony/process": "^5.4 | ^6.0 | ^7.0", + "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0", "unleashedtech/php-coding-standard": "^3.1.1", "vimeo/psalm": "^4.24.0 || ^5.0.0" }, @@ -3326,7 +3327,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.6-dev" + "dev-main": "2.7-dev" } }, "autoload": { @@ -3383,7 +3384,7 @@ "type": "tidelift" } ], - "time": "2024-08-16T11:46:16+00:00" + "time": "2024-12-07T15:34:16+00:00" }, { "name": "league/config", @@ -7492,16 +7493,16 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" + "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", + "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", "shasum": "" }, "require": { @@ -7539,7 +7540,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1" }, "funding": [ { @@ -7555,7 +7556,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/error-handler", @@ -9000,8 +9001,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -13561,7 +13562,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": {}, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { @@ -13582,6 +13583,6 @@ "ext-xml": "*", "ext-xmlwriter": "*" }, - "platform-dev": {}, + "platform-dev": [], "plugin-api-version": "2.6.0" } From 90794cb515813940a8bf5830b60657a28fff2eae Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Dec 2024 21:35:14 +0100 Subject: [PATCH 2/6] Experimental branch build. --- .github/workflows/release.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3be0d1f164..f1915bc28c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: inputs: version: - description: 'Release "v1.2.3" or "develop"' + description: 'Release "v1.2.3" or "develop" or "branch-abc"' required: true default: 'develop' schedule: @@ -23,6 +23,10 @@ jobs: if [[ "develop" == "$version" ]]; then git checkout --track origin/develop git pull + elif [[ "$version" == branch* ]]; then + PULLBRANCH=${branch:7} + git checkout --track origin/$PULLBRANCH + git pull else git config user.name github-actions git config user.email 41898282+github-actions[bot]@users.noreply.github.com @@ -31,6 +35,7 @@ jobs: git checkout main git merge develop fi + exit 1 env: version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }} - name: Setup PHP From 69e1eb3eff246a281a68949951b6fc2b9765fe11 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Dec 2024 21:37:45 +0100 Subject: [PATCH 3/6] echo debug and upgrade to 8.4 --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f1915bc28c..db2cf97ffb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,6 +25,7 @@ jobs: git pull elif [[ "$version" == branch* ]]; then PULLBRANCH=${branch:7} + echo "The branch is '$PULLBRANCH' ($version)" git checkout --track origin/$PULLBRANCH git pull else @@ -41,7 +42,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.3' + php-version: '8.4' extensions: mbstring, intl, zip, bcmath - name: crowdin action uses: crowdin/github-action@v2 From 1c691cca33ac4e39d20077ab6c5be3188792293a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Dec 2024 21:39:30 +0100 Subject: [PATCH 4/6] Duh, that wasn't smart. --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index db2cf97ffb..28bb74c9aa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: git checkout --track origin/develop git pull elif [[ "$version" == branch* ]]; then - PULLBRANCH=${branch:7} + PULLBRANCH=${version:7} echo "The branch is '$PULLBRANCH' ($version)" git checkout --track origin/$PULLBRANCH git pull From 1fa928b98ff7e6c7d88e778cb7e20c49fa9d0129 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Dec 2024 21:45:20 +0100 Subject: [PATCH 5/6] Should work from here --- .github/workflows/release.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 28bb74c9aa..6f5ead9f73 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,6 +7,10 @@ on: description: 'Release "v1.2.3" or "develop" or "branch-abc"' required: true default: 'develop' + phpversion: + description: 'PHP version' + required: true + default: '8.3' schedule: - cron: '0 3 * * MON' @@ -36,13 +40,12 @@ jobs: git checkout main git merge develop fi - exit 1 env: version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }} - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.4' + php-version: ${{ github.event.inputs.phpversion }} extensions: mbstring, intl, zip, bcmath - name: crowdin action uses: crowdin/github-action@v2 @@ -172,6 +175,16 @@ jobs: tarName=FireflyIII-develop.tar.gz fi + # if this is a branch build, also slightly different variable names. + if [[ "$version" == branch* ]]; then + [[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0; + # branch builds overrule develop + releaseName=develop-$(date +'%Y%m%d') + originalName=$releaseName + zipName=FireflyIII-develop.zip + tarName=FireflyIII-develop.tar.gz + fi + # in both cases, if the release or tag already exists, add ".1" until it no longer exists. tagFound=true tagCount=1 @@ -214,7 +227,7 @@ jobs: gpg --armor --detach-sign $tarName # create a development (nightly) release: - if [[ "develop" == "$version" ]]; then + if [[ "develop" == "$version" ]] || [[ "$version" == branch* ]]; then echo 'Develop release.' # add text to output.txt (instructions) rm output.txt From f0e29138024958cde5d268b6c10f5172f8c7c675 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Dec 2024 21:50:46 +0100 Subject: [PATCH 6/6] Ignore phpcs errors. --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6f5ead9f73..87616ec7e0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -142,7 +142,7 @@ jobs: rm -rf vendor composer.lock composer update --no-dev --no-scripts --no-plugins -q sudo chown -R runner:docker resources/lang - .ci/phpcs.sh + .ci/phpcs.sh || true - name: Import GPG key uses: crazy-max/ghaction-import-gpg@v6 with: