Skip to content

Commit 1865b22

Browse files
author
sayan goswami
committed
Merge branch 'release/3.24.0'
2 parents bc0e9d6 + d039f12 commit 1865b22

File tree

24 files changed

+292
-183
lines changed

24 files changed

+292
-183
lines changed

‎.github/workflows/live-test.yml

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
---
2+
name: ORCA CI LIVE TEST
3+
on:
4+
push:
5+
branches: [ main, develop, wip, support/**, release/**, hotfix/** ]
6+
paths-ignore:
7+
- .idea/**
8+
- docs/**
9+
pull_request:
10+
branches: [ develop ]
11+
paths-ignore:
12+
- .idea/**
13+
- docs/**
14+
schedule:
15+
# Daily at 00:00:00 UTC.
16+
# @see https://crontab.cronhub.io/
17+
- cron: "0 0 * * *"
18+
jobs:
19+
build:
20+
runs-on: ubuntu-latest
21+
env:
22+
# Boolean values must be quoted, otherwise they will be converted to lower case and break ORCA scripts.
23+
ORCA_SUT_NAME: drupal/example
24+
ORCA_SUT_BRANCH: main
25+
ORCA_ENABLE_NIGHTWATCH: "FALSE"
26+
# Hardcode path since GITHUB_WORKSPACE can't be used here.
27+
# @see https://github.community/t/how-to-use-env-context/16975/9
28+
ORCA_SUT_DIR: /home/runner/work/orca/example
29+
ORCA_SELF_TEST_COVERAGE_CLOVER: $HOME/build/logs/clover-self.xml
30+
ORCA_LIVE_TEST: TRUE
31+
32+
strategy:
33+
matrix:
34+
orca-job:
35+
- " "
36+
php-version: [ "7.4" ]
37+
steps:
38+
- uses: actions/checkout@v2
39+
40+
- uses: actions/setup-node@v2
41+
with:
42+
node-version: 16.x
43+
44+
- uses: shivammathur/setup-php@v2
45+
with:
46+
php-version: ${{ matrix.php-version }}
47+
coverage: xdebug
48+
49+
- name: Before install
50+
run: |
51+
../orca/bin/ci/self-test/before_install.sh
52+
../orca/bin/ci/before_install.sh
53+
54+
- name: Install
55+
run: |
56+
../orca/bin/ci/self-test/install.sh
57+
../orca/bin/ci/install.sh
58+
59+
- name: Before script
60+
run: ../orca/bin/ci/before_script.sh
61+
62+
- name: Script
63+
run: |
64+
../orca/bin/ci/self-test/script.sh
65+
../orca/bin/ci/script.sh
66+
67+
# These two jobs need to run regardless of success or failure in ORCA's self-tests in order to exercise the code.
68+
- name: After script
69+
run: |
70+
../orca/bin/ci/self-test/after_success.sh
71+
../orca/bin/ci/after_success.sh
72+
../orca/bin/ci/after_failure.sh
73+
../orca/bin/ci/after_script.sh
74+
75+
# Require all checks to pass without having to enumerate them in the branch protection UI.
76+
# @see https://github.community/t/is-it-possible-to-require-all-github-actions-tasks-to-pass-without-enumerating-them/117957
77+
all-successful:
78+
if: always()
79+
runs-on: ubuntu-latest
80+
needs: [build]
81+
steps:
82+
- name: Decide whether the needed jobs succeeded or failed
83+
uses: re-actors/alls-green@release/v1
84+
with:
85+
jobs: ${{ toJSON(needs) }}
86+
- name: All checks successful
87+
run: echo "🎉"

‎.github/workflows/orca.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
ORCA_SUT_DIR: /home/runner/work/orca/example
3131
ORCA_SELF_TEST_COVERAGE_CLOVER: $HOME/build/logs/clover-self.xml
3232
ORCA_JOB: ${{ matrix.orca-job }}
33-
ORCA_LIVE_TEST: ${{ matrix.orca-live-test }}
3433

3534
strategy:
3635
matrix:
@@ -57,8 +56,8 @@ jobs:
5756
- LOOSE_DEPRECATED_CODE_SCAN
5857
# - ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
5958
# - INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
60-
- ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
61-
- INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
59+
# - ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
60+
# - INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
6261
php-version: [ "7.4" ]
6362
include:
6463
- orca-job: ISOLATED_TEST_ON_CURRENT
@@ -77,10 +76,12 @@ jobs:
7776
php-version: "8.1"
7877
orca-enable-nightwatch: "TRUE"
7978

80-
- orca-job: ""
81-
orca-live-test: "TRUE"
82-
php-version: "7.4"
83-
orca-enable-nightwatch: "FALSE"
79+
- orca-job: ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
80+
php-version: "8.1"
81+
orca-enable-nightwatch: "TRUE"
82+
83+
- orca-job: INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
84+
php-version: "8.1"
8485

8586
steps:
8687
- uses: actions/checkout@v2

‎.travis.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ version: ~> 1.0
88

99
php: "7.4"
1010

11-
addons:
12-
chrome: stable
13-
1411
cache:
1512
directories:
1613
- "$HOME/.composer/cache"
@@ -46,8 +43,8 @@ jobs:
4643
- { env: ORCA_JOB=INTEGRATED_TEST_ON_PREVIOUS_MINOR, name: "Integrated test on previous minor Drupal core version" }
4744
- { env: ORCA_JOB=INTEGRATED_UPGRADE_TEST_FROM_PREVIOUS_MINOR, name: "Integrated upgrade test from previous minor Drupal core version" }
4845
- { env: ORCA_JOB=ISOLATED_TEST_ON_CURRENT, name: "Isolated test on current Drupal core version" }
49-
- { env: ORCA_JOB=ISOLATED_TEST_ON_CURRENT, php: "8.0", dist: focal, name: "Isolated test on current Drupal core version and PHP 8.0" }
50-
- { env: ORCA_JOB=ISOLATED_TEST_ON_CURRENT, php: "8.1", dist: focal, name: "Isolated test on current Drupal core version and PHP 8.1" }
46+
- { env: ORCA_JOB=ISOLATED_TEST_ON_CURRENT, php: "8.0", name: "Isolated test on current Drupal core version and PHP 8.0" }
47+
- { env: ORCA_JOB=ISOLATED_TEST_ON_CURRENT, php: "8.1", name: "Isolated test on current Drupal core version and PHP 8.1" }
5148
- { env: ORCA_JOB=INTEGRATED_TEST_ON_CURRENT, name: "Integrated test on current Drupal core version" }
5249
- { env: ORCA_JOB=INTEGRATED_UPGRADE_TEST_TO_NEXT_MINOR, name: "Integrated upgrade test to next minor Drupal core version" }
5350
- { env: ORCA_JOB=INTEGRATED_UPGRADE_TEST_TO_NEXT_MINOR_DEV, name: "Integrated upgrade test to next minor dev Drupal core version" }
@@ -60,10 +57,10 @@ jobs:
6057
- { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MINOR, name: "Integrated test on next minor Drupal core version" }
6158
- { env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MINOR_DEV, name: "Isolated test on next minor dev Drupal core version" }
6259
- { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MINOR_DEV, name: "Integrated test on next minor dev Drupal core version" }
63-
# - { env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER, name: "Isolated test on next major, latest minor beta-or-later Drupal core version" }
64-
# - { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER, name: "Integrated test on next major, latest minor beta-or-later Drupal core version" }
65-
- { env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV, php: "8.1", dist: focal, name: "Isolated test on next major, latest minor dev Drupal core version" }
66-
- { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV, php: "8.1", dist: focal, name: "Integrated test on next major, latest minor dev Drupal core version" }
60+
- { env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER, php: "8.1", name: "Isolated test on next major, latest minor beta-or-later Drupal core version" }
61+
- { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER, php: "8.1", name: "Integrated test on next major, latest minor beta-or-later Drupal core version" }
62+
- { env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV, php: "8.1", name: "Isolated test on next major, latest minor dev Drupal core version" }
63+
- { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV, php: "8.1", name: "Integrated test on next major, latest minor dev Drupal core version" }
6764
- { env: ORCA_JOB=ISOLATED_UPGRADE_TEST_TO_NEXT_MAJOR_BETA_OR_LATER, name: "Isolated upgrade test to next major beta-or-later Drupal core version" }
6865
- { env: ORCA_JOB=ISOLATED_UPGRADE_TEST_TO_NEXT_MAJOR_DEV, name: "Isolated upgrade test to next major dev Drupal core version" }
6966
- { env: ORCA_LIVE_TEST=TRUE ORCA_PACKAGES_CONFIG= ORCA_PACKAGES_CONFIG_ALTER= ORCA_ENABLE_NIGHTWATCH=FALSE, name: "Integrated live test" }
@@ -75,8 +72,10 @@ jobs:
7572
- env: ORCA_LIVE_TEST=TRUE ORCA_PACKAGES_CONFIG= ORCA_PACKAGES_CONFIG_ALTER= ORCA_ENABLE_NIGHTWATCH=FALSE
7673
- env: ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV
7774
- env: ORCA_JOB=INTEGRATED_TEST_ON_CURRENT_DEV
78-
- { env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV, php: "8.1", dist: focal }
79-
- { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV, php: "8.1", dist: focal }
75+
- { env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV, php: "8.1"}
76+
- { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV, php: "8.1"}
77+
- { env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER, php: "8.1"}
78+
- { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER, php: "8.1"}
8079

8180
before_install:
8281
- nvm install 16; nvm use 16

‎bin/ci/_includes.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ export PATH="$ORCA_FIXTURE_DIR/vendor/bin:$PATH"
104104
export PATH="$CI_WORKSPACE/vendor/bin:$PATH"
105105
# Put this last to ensure that the host's Composer is preferred.
106106
export PATH="$HOME/.phpenv/shims/:$PATH"
107+
export PATH="/usr/local/bin/:$PATH"
108+
export PATH="/usr/bin/:$PATH"
107109

108110
# Add convenient aliases.
109111
alias drush='drush -r "$ORCA_FIXTURE_DIR"'
@@ -128,8 +130,10 @@ allowed_failures=(
128130
"ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV"
129131
"INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV"
130132
"INTEGRATED_TEST_ON_CURRENT_DEV"
133+
"ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER"
134+
"INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER"
131135
)
132-
if [[ " ${allowed_failures[*]} " =~ " ${ORCA_JOB} " || "${ORCA_LIVE_TEST}" == "TRUE" && ! $TRAVIS ]]; then
136+
if [[ " ${allowed_failures[*]} " =~ " ${ORCA_JOB} " && ! $TRAVIS ]]; then
133137
set +e
134138
notice "This job is allowed to fail and will report as passing regardless of outcome."
135139
fi

‎bin/ci/before_install.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,27 @@ if [[ "$TRAVIS" ]]; then
5151

5252
# Install the PECL YAML parser for strict YAML parsing.
5353
yes | pecl install yaml
54+
55+
# Install ChroneDriver.
56+
# @see https://chromedriver.chromium.org/downloads/version-selection
57+
# Get Google Chrome version.
58+
CHROMEDRIVER="$( google-chrome-stable --version)"
59+
echo "$CHROMEDRIVER"
60+
CHROMEDRIVER_VERSION="$(echo "$CHROMEDRIVER" | awk '{print $3}')"
61+
echo "CHROMEDRIVER_VERSION=$CHROMEDRIVER_VERSION"
62+
# Cut off last part from google chrome version.
63+
CHROMEDRIVER_VERSION_FAMILY="$(echo "$CHROMEDRIVER_VERSION" | awk -F'.' '{print $1,$2,$3}' OFS='.' )"
64+
echo "VERSION_FAMILY=$CHROMEDRIVER_VERSION_FAMILY"
65+
# check latest_release
66+
VERSION=$(curl -f --silent https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${CHROMEDRIVER_VERSION_FAMILY})
67+
echo "FINAL_VERSION=$VERSION"
68+
# Download driver
69+
wget -N https://chromedriver.storage.googleapis.com/${VERSION}/chromedriver_linux64.zip -P ~/
70+
unzip ~/chromedriver_linux64.zip -d ~/
71+
rm ~/chromedriver_linux64.zip
72+
sudo mv -f ~/chromedriver /usr/local/share/
73+
sudo chmod +x /usr/local/share/chromedriver
74+
sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver
5475
fi
5576

5677
# Display PHP information.

‎bin/ci/script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if [[ "$ORCA_ENABLE_NIGHTWATCH" == "TRUE" && "$ORCA_SUT_HAS_NIGHTWATCH_TESTS" &&
2222
SERVER_PID=$!
2323

2424
# @todo could we set DRUPAL_TEST_CHROMEDRIVER_AUTOSTART instead of launching Chromedriver manually?
25-
$ORCA_ROOT/vendor/bin/chromedriver --disable-dev-shm-usage --disable-extensions --disable-gpu --headless --no-sandbox --port=4444 &
25+
chromedriver --disable-dev-shm-usage --disable-extensions --disable-gpu --headless --no-sandbox --port=4444 &
2626
CHROMEDRIVER_PID=$!
2727

2828
eval "yarn test:nightwatch \\

‎bin/ci/self-test/_includes.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
source ../_includes.sh
1313

1414
if [[ "$ORCA_LIVE_TEST" ]]; then
15+
set +e
16+
notice "This job is allowed to fail and will report as passing regardless of outcome."
1517
unset ORCA_PACKAGES_CONFIG
1618
unset ORCA_PACKAGES_CONFIG_ALTER
1719
fi

‎composer.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
"symfony/phpunit-bridge": "^6.0",
5151
"symfony/process": "^5.4",
5252
"symfony/yaml": "^5.4",
53-
"webdriver-binary/binary-chromedriver": "^6.1.0",
5453
"weitzman/drupal-test-traits": "^1.3",
5554
"zumba/amplitude-php": "^1.0"
5655
},
@@ -68,8 +67,7 @@
6867
"allow-plugins": {
6968
"cweagans/composer-patches": true,
7069
"dealerdirect/phpcodesniffer-composer-installer": true,
71-
"ergebnis/composer-normalize": true,
72-
"webdriver-binary/binary-chromedriver": true
70+
"ergebnis/composer-normalize": true
7371
},
7472
"discard-changes": true,
7573
"preferred-install": {

‎composer.lock

Lines changed: 1 addition & 110 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v3.23.0
1+
v3.24.0

‎config/packages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ drupal/acquia_contenthub:
6060
version_dev: 2.x-dev
6161

6262
drupal/acquia_lift:
63-
version: ~
64-
version_dev: ~
63+
version: 4.x
64+
version_dev: 4.x-dev
6565

6666
drupal/acquia_purge:
6767
version: 1.x

0 commit comments

Comments
 (0)