From 7e9d137779ad0c0983e07da294524a5c76cb7053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 21 Feb 2023 12:35:07 +0100 Subject: [PATCH 1/3] Set up master branch to become 4.5 in the future --- .github/workflows/browser-tests.yml | 2 -- composer.json | 42 ++++++++++++++--------------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 312aaef..eaf60ac 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -19,7 +19,6 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "content" - project-version: "4.4.x-dev" test-suite: "--profile=regression --suite=content" test-setup-phase-1: "--profile=regression --suite=setup-content --tags=~@part2 --mode=standard" test-setup-phase-2: "--profile=regression --suite=setup-content --tags=@part2 --mode=standard" @@ -42,7 +41,6 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "content" - project-version: "4.4.x-dev" test-suite: "--profile=regression --suite=content" test-setup-phase-1: "--profile=regression --suite=setup-content --tags=~@part2 --mode=standard" test-setup-phase-2: "--profile=regression --suite=setup-content --tags=@part2 --mode=standard" diff --git a/composer.json b/composer.json index ac6f80f..06ae8b1 100644 --- a/composer.json +++ b/composer.json @@ -10,26 +10,26 @@ ], "require": { "php": "^7.4 || ^8.0", - "ibexa/oss": "~4.4.x-dev", - "ibexa/measurement": "~4.4.x-dev", - "ibexa/migrations": "~4.4.x-dev", - "ibexa/image-editor": "~4.4.x-dev", - "ibexa/oauth2-client": "~4.4.x-dev", - "ibexa/installer": "~4.4.x-dev", - "ibexa/product-catalog": "~4.4.x-dev", - "ibexa/seo": "~4.4.x-dev", - "ibexa/scheduler": "~4.4.x-dev", - "ibexa/calendar": "~4.4.x-dev", - "ibexa/connector-dam": "~4.4.x-dev", - "ibexa/elasticsearch": "~4.4.x-dev", - "ibexa/fastly": "~4.4.x-dev", - "ibexa/icons": "~4.4.x-dev", - "ibexa/personalization": "~4.4.x-dev", - "ibexa/version-comparison": "~4.4.x-dev", - "ibexa/workflow": "~4.4.x-dev", - "ibexa/taxonomy": "~4.4.x-dev", - "ibexa/tree-builder": "~4.4.x-dev", - "ibexa/content-tree": "~4.4.x-dev", + "ibexa/oss": "~4.5.x-dev", + "ibexa/measurement": "~4.5.x-dev", + "ibexa/migrations": "~4.5.x-dev", + "ibexa/image-editor": "~4.5.x-dev", + "ibexa/oauth2-client": "~4.5.x-dev", + "ibexa/installer": "~4.5.x-dev", + "ibexa/product-catalog": "~4.5.x-dev", + "ibexa/seo": "~4.5.x-dev", + "ibexa/scheduler": "~4.5.x-dev", + "ibexa/calendar": "~4.5.x-dev", + "ibexa/connector-dam": "~4.5.x-dev", + "ibexa/elasticsearch": "~4.5.x-dev", + "ibexa/fastly": "~4.5.x-dev", + "ibexa/icons": "~4.5.x-dev", + "ibexa/personalization": "~4.5.x-dev", + "ibexa/version-comparison": "~4.5.x-dev", + "ibexa/workflow": "~4.5.x-dev", + "ibexa/taxonomy": "~4.5.x-dev", + "ibexa/tree-builder": "~4.5.x-dev", + "ibexa/content-tree": "~4.5.x-dev", "gregwar/captcha-bundle": "^2.1" }, "require-dev": { @@ -37,7 +37,7 @@ }, "extra": { "branch-alias": { - "dev-master": "4.4.x-dev" + "dev-master": "4.5.x-dev" } } } From a46975b628b3d85118b4eb0e818f59425049bf6f Mon Sep 17 00:00:00 2001 From: Petro Kurbatskyi <67897517+ibexa-yuna@users.noreply.github.com> Date: Tue, 18 Apr 2023 15:30:50 +0200 Subject: [PATCH 2/3] Fixed getting previous release tag (#77) Affects only pre-release tags --- .github/workflows/release_tag.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_tag.yml b/.github/workflows/release_tag.yml index be47bd5..7fe0a1c 100644 --- a/.github/workflows/release_tag.yml +++ b/.github/workflows/release_tag.yml @@ -26,7 +26,7 @@ jobs: - name: Get previous last full release id: prevfull run: | - OUT=$(hub api /repos/${{ github.repository }}/releases | jq -r -s '[ .[][].tag_name | select(. | contains("rc") or contains("beta") or contains("alpha") | not) ] | first') + OUT=$(hub api /repos/${{ github.repository }}/releases | jq -r '[.[] | select(.tag_name | test("^(?!.*alpha|.*beta|.*rc).*$")) | .tag_name] | sort_by(.) | last') echo "tag=$( echo "$OUT" )" >> $GITHUB_OUTPUT env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 2aea9ff0f93f0178fe37850a4bc7708e20012cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Wed, 17 May 2023 12:52:41 +0200 Subject: [PATCH 3/3] [TMP] Run regression --- dependencies.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 dependencies.json diff --git a/dependencies.json b/dependencies.json new file mode 100644 index 0000000..e9f771b --- /dev/null +++ b/dependencies.json @@ -0,0 +1,11 @@ +{ + "recipesEndpoint": "", + "packages": [ + { + "requirement": "dev-IBX-5735-languages-dropdown-position as 4.4.x-dev", + "repositoryUrl": "https://github.com/ibexa/calendar", + "package": "ibexa/calendar", + "shouldBeAddedAsVCS": true + } + ] +} \ No newline at end of file