Skip to content

Commit 72c3f03

Browse files
adriendupuisadriendupuis
committed
Merge remote-tracking branch 'origin/release/v2.5.23' into release/v2.5
# Conflicts: # composer.json # composer.lock # yarn.lock
2 parents b38fdfb + 714d2f9 commit 72c3f03

File tree

9 files changed

+2486
-1876
lines changed

9 files changed

+2486
-1876
lines changed

‎.env.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ DATABASE_NAME=ezp
1313
PHP_IMAGE=ezsystems/php:7.3-v2-node10
1414
NGINX_IMAGE=nginx:stable
1515
MYSQL_IMAGE=healthcheck/mariadb
16-
SELENIUM_IMAGE=selenium/standalone-chrome-debug:3.141.59-20200326
16+
SELENIUM_IMAGE=selenium/standalone-chrome-debug:3.141.59-20210422
1717
REDIS_IMAGE=healthcheck/redis
1818

1919
APP_DOCKER_FILE=doc/docker/Dockerfile-app

‎.github/workflows/release_tag.yml

+142
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
name: Create Release for tag
2+
3+
on:
4+
push:
5+
tags:
6+
- 'v*'
7+
- '!v*-alpha*'
8+
9+
jobs:
10+
provide_changed_packages:
11+
# see json juggling: https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#example-6
12+
# see https://stackoverflow.com/a/62953566/1348344
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: Set Environment
17+
run: |
18+
echo "BUILD_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
19+
20+
- uses: actions/checkout@v2
21+
22+
# load current composer.lock
23+
- id: currentLock
24+
name: Gather latest package information
25+
run: |
26+
OUT=$(jq --slurp '[.[].packages[] | select(.name | contains("ezsystems") or contains("ibexa")) | [.name, .version] | { name: (.[0]), version: .[1] }]' composer.lock)
27+
echo "::set-output name=lock::$( echo "$OUT" | sed ':a;N;$!ba;s/\n/%0A/g' )"
28+
29+
- name: Get previous release tag based on type
30+
id: prevrelease
31+
uses: ibexa/version-logic-action@master
32+
with:
33+
currentTag: ${{ env.BUILD_TAG }}
34+
35+
# checkout previous tag
36+
- uses: actions/checkout@v2
37+
with:
38+
ref: ${{ steps.prevrelease.outputs.previousTag }}
39+
40+
# load previous composer.lock
41+
- id: previousLock
42+
name: Gather previous package information
43+
run: |
44+
OUT=$(jq --slurp '[.[].packages[] | select(.name | contains("ezsystems") or contains("ibexa")) | [.name, .version] | { name: (.[0]), version: .[1] }]' composer.lock)
45+
echo "::set-output name=lock::$( echo "$OUT" | sed ':a;N;$!ba;s/\n/%0A/g' )"
46+
47+
# do some magic comparing those outputs
48+
- id: output_data
49+
name: Do comparison and output JSON with changes
50+
run: |
51+
FILE1=$(mktemp)
52+
FILE2=$(mktemp)
53+
cat > $FILE1 <<'EOF'
54+
${{ steps.previousLock.outputs.lock }}
55+
EOF
56+
cat > $FILE2 <<'EOF'
57+
${{ steps.currentLock.outputs.lock }}
58+
EOF
59+
# Get only changed packages and sort versions in ascending order
60+
# Step 1: Merge composer.json from two versions, grouping by .name
61+
# Step 2: Take .versions key and remove duplicate versions (means this bundle did not change)
62+
# Step 3: Select only those bundles that have more than 1 version in .versions
63+
# Step 4: Sort versions
64+
# Step 5: (outer brackets) Wrap that into JSON list of objects
65+
# Note: zzzz is added as an additional suffix to properly sort out alpha/beta/etc pre-releases (v2.5.1-alphazzzz < v2.5.1zzzz)
66+
OUT=$(jq -s 'flatten | group_by(.name)' $FILE1 $FILE2 | jq -s '[ .[][] | {name: (.[0].name), versions: [ .[0].version, .[1].version ] | unique} | select(.versions | length > 1) ] | .[].versions |= sort_by( . + "zzzz" | [scan("[0-9]+|[a-z]+")] | map(tonumber? // .) )')
67+
echo "::set-output name=matrix::$( echo "$OUT" | sed ':a;N;$!ba;s/\n/%0A/g' )"
68+
69+
# this step is needed, so the output gets to the next defined job
70+
outputs:
71+
matrix: ${{ steps.output_data.outputs.matrix }}
72+
73+
get_package_changelogs:
74+
needs: provide_changed_packages
75+
76+
runs-on: ubuntu-latest
77+
78+
steps:
79+
- name: Set Environment
80+
run: |
81+
echo "BUILD_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
82+
83+
- name: Get previous release tag based on type
84+
id: prevrelease
85+
uses: ibexa/version-logic-action@master
86+
with:
87+
currentTag: ${{ env.BUILD_TAG }}
88+
89+
- name: Checkout Generator
90+
uses: actions/checkout@v2
91+
with:
92+
repository: ibexa/changelog-generator-action
93+
ref: v2
94+
95+
- name: Setup Python environment
96+
uses: actions/setup-python@v2
97+
with:
98+
python-version: '3.x'
99+
100+
- name: Install pygithub & jira
101+
run: |
102+
pip install pygithub jira
103+
104+
- name: Run generator in a loop
105+
id: generator
106+
env:
107+
INPUT_GITHUB_TOKEN: ${{ secrets.TRAVIS_GITHUB_TOKEN }}
108+
INPUT_JIRA_TOKEN: ${{ secrets.JIRA_TOKEN }}
109+
run: |
110+
cat > input.json <<'EOF'
111+
${{ needs.provide_changed_packages.outputs.matrix }}
112+
EOF
113+
export INPUT_BARE=True
114+
echo "${{ github.repository }} ${{ env.BUILD_TAG }} change log" >> generator_output
115+
echo "" >> generator_output
116+
echo "Changes since ${{ steps.prevrelease.outputs.previousTag }}" >> generator_output
117+
echo "" >> generator_output
118+
jq -c '.[]' input.json | while read i; do
119+
export GITHUB_REPOSITORY=$(jq -r '.name' <<< "$i")
120+
export INPUT_PREVIOUSTAG=$(jq -r '.versions[0]' <<< "$i")
121+
export INPUT_CURRENTTAG=$(jq -r '.versions[1]' <<< "$i")
122+
echo -n "## " >> generator_output
123+
python main.py >> generator_output
124+
echo '' >> generator_output
125+
done
126+
echo "::set-output name=output::$( cat generator_output | sed ':a;N;$!ba;s/\n/%0A/g' )"
127+
128+
- name: Create Release
129+
id: create_release
130+
uses: zendesk/action-create-release@v1
131+
with:
132+
tag_name: ${{ env.BUILD_TAG }}
133+
body: |
134+
${{ steps.generator.outputs.output }}
135+
env:
136+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
137+
138+
- name: Archive markdown
139+
uses: actions/upload-artifact@v2
140+
with:
141+
name: changelogs
142+
path: generator_output

‎.platform/varnish.vcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// - Varnish xkey vmod (via varnish-modules package, or via Varnish Plus)
44
// - eZ Platform 2.5LTS or higher with ezplatform-http-cache (this) bundle
55
//
6-
// Make sure to at least adjust default parameters.yml, defaults there reflect our testing needs with docker.
6+
// WARNING: Not for us with Fastly, see documentation for where to find dedicated Fastly VCL.
77

88
// Not applicable on Platform.sh:
99
//vcl 4.0;

‎app/config/routing.yml

+3
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ ezplatform.ee.page_builder:
3737
defaults:
3838
siteaccess_group_whitelist: '%admin_group_name%'
3939

40+
ezplatform.ee.page_builder_preview:
41+
resource: '@EzPlatformPageBuilderBundle/Resources/config/routing_preview.yaml'
42+
4043
ezplatform.ee.form_builder:
4144
resource: '@EzPlatformFormBuilderBundle/Resources/config/routing.yml'
4245
defaults:

‎bin/.travis/trusty/setup_ezplatform.sh

+13-1
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,15 @@ if [[ -n "${DEPENDENCY_PACKAGE_NAME}" ]]; then
7070
cd -
7171

7272
# use local checkout path relative to docker volume
73+
# create the directory for non-container commands to pass
74+
if [ ! -d /var/www/${BASE_PACKAGE_NAME} ]; then
75+
sudo mkdir -p /var/www/${BASE_PACKAGE_NAME}
76+
fi
7377
echo "> Make composer use tested dependency local checkout ${TMP_TRAVIS_BRANCH} of ${BASE_PACKAGE_NAME}"
74-
composer config repositories.localDependency git /var/www/${BASE_PACKAGE_NAME}
78+
REPOSITORY_PROPERTIES=$( jq -n \
79+
--arg basePackageName "/var/www/$BASE_PACKAGE_NAME" \
80+
'{"type": "path", "url": $basePackageName, "options": { "symlink": false }}' )
81+
composer config repositories.localDependency "$REPOSITORY_PROPERTIES"
7582

7683
echo "> Require ${DEPENDENCY_PACKAGE_NAME}:dev-${TMP_TRAVIS_BRANCH} as ${BRANCH_ALIAS}"
7784
if ! composer require --no-update "${DEPENDENCY_PACKAGE_NAME}:dev-${TMP_TRAVIS_BRANCH} as ${BRANCH_ALIAS}"; then
@@ -81,6 +88,11 @@ if [[ -n "${DEPENDENCY_PACKAGE_NAME}" ]]; then
8188

8289
fi
8390

91+
if [[ -n "${DOCKER_PASSWORD}" ]]; then
92+
echo "> Set up Docker credentials"
93+
echo ${DOCKER_PASSWORD} | docker login -u ${DOCKER_USERNAME} --password-stdin
94+
fi
95+
8496
echo "> Install DB and dependencies"
8597
docker-compose -f doc/docker/install-dependencies.yml up --abort-on-container-exit
8698

‎bin/.travis/trusty/setup_from_external_repo.sh

+5
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ if [ "$COMPOSE_FILE" = "" ] ; then
3333
exit 1
3434
fi
3535

36+
if [[ -n "${DOCKER_PASSWORD}" ]]; then
37+
echo "> Set up Docker credentials"
38+
echo ${DOCKER_PASSWORD} | docker login -u ${DOCKER_USERNAME} --password-stdin
39+
fi
40+
3641
echo "> Move '$REPO_DIR' to 'tmp_travis_folder'"
3742
mv $REPO_DIR tmp_travis_folder
3843
ls -al tmp_travis_folder

‎composer.json

+26-27
Original file line numberDiff line numberDiff line change
@@ -31,32 +31,32 @@
3131
"php": "^7.1.3",
3232
"doctrine/doctrine-bundle": "^1.9.1",
3333
"doctrine/orm": "^2.6.3",
34-
"ezsystems/date-based-publisher": "~3.2.6",
35-
"ezsystems/doctrine-dbal-schema": "~0.1.3",
36-
"ezsystems/ez-support-tools": "~1.0.8",
37-
"ezsystems/ezplatform-admin-ui": "~1.5.15",
38-
"ezsystems/ezplatform-admin-ui-assets": "~4.2.1",
39-
"ezsystems/ezplatform-admin-ui-modules": "~1.5.10",
40-
"ezsystems/ezplatform-core": "~1.0.4",
34+
"ezsystems/date-based-publisher": "~3.2.8",
35+
"ezsystems/doctrine-dbal-schema": "~0.1.4",
36+
"ezsystems/ez-support-tools": "~1.0.11",
37+
"ezsystems/ezplatform-admin-ui": "~1.5.23",
38+
"ezsystems/ezplatform-admin-ui-assets": "~4.2.2",
39+
"ezsystems/ezplatform-admin-ui-modules": "~1.5.12",
40+
"ezsystems/ezplatform-core": "~1.0.5",
4141
"ezsystems/ezplatform-cron": "~2.0.4",
4242
"ezsystems/ezplatform-design-engine": "~2.0.0",
43-
"ezsystems/ezplatform-ee-installer": "~2.5.3",
44-
"ezsystems/ezplatform-form-builder": "~1.2.10",
43+
"ezsystems/ezplatform-ee-installer": "~2.5.4",
44+
"ezsystems/ezplatform-form-builder": "~1.2.14",
4545
"ezsystems/ezplatform-graphql": "~1.0.8",
4646
"ezsystems/ezplatform-http-cache": "~1.0.2",
47-
"ezsystems/ezplatform-http-cache-fastly": "~1.1.4",
48-
"ezsystems/ezplatform-matrix-fieldtype": "~1.0.6",
49-
"ezsystems/ezplatform-page-builder": "~1.3.14",
50-
"ezsystems/ezplatform-page-fieldtype": "~1.3.10",
51-
"ezsystems/ezplatform-richtext": "~1.1.10",
47+
"ezsystems/ezplatform-http-cache-fastly": "~1.1.5",
48+
"ezsystems/ezplatform-matrix-fieldtype": "~1.0.7",
49+
"ezsystems/ezplatform-page-builder": "~1.3.21",
50+
"ezsystems/ezplatform-page-fieldtype": "~1.3.15",
51+
"ezsystems/ezplatform-richtext": "~1.1.11",
5252
"ezsystems/ezplatform-solr-search-engine": "~1.7.7",
5353
"ezsystems/ezplatform-standard-design": "~0.2.2",
54-
"ezsystems/ezplatform-user": "~1.0.7",
55-
"ezsystems/ezplatform-workflow": "~1.1.10",
56-
"ezsystems/ezpublish-kernel": "~7.5.13",
57-
"ezsystems/flex-workflow": "~3.2.6",
58-
"ezsystems/repository-forms": "~2.5.8",
59-
"ezsystems/symfony-tools": "~1.1.2",
54+
"ezsystems/ezplatform-user": "~1.0.8",
55+
"ezsystems/ezplatform-workflow": "~1.1.13",
56+
"ezsystems/ezpublish-kernel": "~7.5.21",
57+
"ezsystems/flex-workflow": "~3.2.8",
58+
"ezsystems/repository-forms": "~2.5.10",
59+
"ezsystems/symfony-tools": "~1.1.6",
6060
"friendsofsymfony/jsrouting-bundle": "^1.6.3",
6161
"gregwar/captcha-bundle": "^2.0",
6262
"incenteev/composer-parameter-handler": "^2.1.3",
@@ -65,7 +65,6 @@
6565
"overblog/graphql-bundle": "^0.11.11",
6666
"scssphp/scssphp": "~1.0",
6767
"sensio/distribution-bundle": "^5.0.25",
68-
"sensiolabs/security-checker": "^5.0",
6968
"symfony/assetic-bundle": "^2.8.2",
7069
"symfony/monolog-bundle": "^3.3.1",
7170
"symfony/swiftmailer-bundle": "^3.2.4",
@@ -87,19 +86,20 @@
8786
"ezsystems/allure-behat": "~2.0.3",
8887
"ezsystems/allure-php-api": "~2.0.1",
8988
"ezsystems/behat-screenshot-image-driver-cloudinary": "~1.1.1",
90-
"ezsystems/behatbundle": "~7.0.8",
89+
"ezsystems/behatbundle": "~7.0.9",
9190
"liuggio/fastest": "~1.6.0",
9291
"overblog/graphiql-bundle": "^0.1.2",
9392
"phpunit/phpunit": "^6.5.13",
9493
"sensio/generator-bundle": "^3.1.7",
9594
"symfony/phpunit-bridge": "^3.4.18"
9695
},
9796
"conflict": {
98-
"symfony/symfony": "3.4.9||3.4.12||3.4.16",
9997
"doctrine/dbal": "2.7.0",
10098
"doctrine/persistence": "1.3.2",
101-
"twig/twig": "2.6.1",
102-
"symfony/webpack-encore-bundle": "1.2.0||1.2.1"
99+
"laminas/laminas-code": "^4.4",
100+
"symfony/symfony": "3.4.9||3.4.12||3.4.16",
101+
"symfony/webpack-encore-bundle": "1.2.0||1.2.1",
102+
"twig/twig": "2.6.1"
103103
},
104104
"scripts": {
105105
"symfony-scripts": [
@@ -110,8 +110,7 @@
110110
"@php bin/console bazinga:js-translation:dump web/assets --merge-domains",
111111
"@php bin/console assetic:dump",
112112
"yarn install",
113-
"EzSystems\\EzPlatformEncoreBundle\\Composer\\ScriptHandler::compileAssets",
114-
"@php bin/security-checker security:check || true"
113+
"EzSystems\\EzPlatformEncoreBundle\\Composer\\ScriptHandler::compileAssets"
115114
],
116115
"post-install-cmd": [
117116
"@symfony-scripts"

0 commit comments

Comments
 (0)