Skip to content

Commit

Permalink
Merge branch 'release/1.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
TravisCarden committed Mar 27, 2020
2 parents 33017a1 + 1ded23a commit 7f38c2e
Show file tree
Hide file tree
Showing 19 changed files with 2,434 additions and 2,778 deletions.
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ env:
global:
- ORCA_SUT_NAME=drupal/example
- ORCA_SUT_BRANCH=master
- ORCA_PACKAGES_CONFIG=tests/Fixture/packages.yml
- ORCA_PACKAGES_CONFIG=example/tests/packages.yml
- ORCA_PACKAGES_CONFIG_ALTER=example/tests/packages_alter.yml
- ORCA_SUT_DIR=${TRAVIS_BUILD_DIR}/../example

Expand All @@ -44,14 +44,18 @@ jobs:
- { name: "Integrated test w/ dev package versions & next minor dev version of Drupal core", env: ORCA_JOB=CORE_NEXT }
- { name: "D9 readiness test", php: "7.3", env: ORCA_JOB=D9_READINESS }
- { name: "Custom job", env: ORCA_JOB=CUSTOM ORCA_CUSTOM_FIXTURE_INIT_ARGS="--help" ORCA_CUSTOM_TESTS_RUN_ARGS="--help" }
- { name: "Integrated live test", env: ORCA_JOB=LIVE_TEST }
allow_failures:
- { php: "7.3", env: ORCA_JOB=D9_READINESS }
- env: ORCA_JOB=LIVE_TEST

before_install:
- ../orca/bin/travis/self-test/before_install.sh
- ../orca/bin/travis/before_install.sh

install: ../orca/bin/travis/install.sh
install:
- ../orca/bin/travis/self-test/install.sh
- ../orca/bin/travis/install.sh

before_script: ../orca/bin/travis/before_script.sh

Expand Down
5 changes: 2 additions & 3 deletions bin/travis/before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@

cd "$(dirname "$0")" || exit; source _includes.sh

# Display configuration values.
printenv | grep ORCA_ | sort

# The remaining before_install commands should only be run on Travis CI.
[[ "$TRAVIS" ]] || exit 0

Expand Down Expand Up @@ -48,7 +45,9 @@ gem install travis
# `composer create-project` approach.
[[ -d "$ORCA_ROOT/vendor" ]] || composer -d"$ORCA_ROOT" install

# Display ORCA version and configuration values.
orca --version
orca debug:env-vars

# Ensure the checked out branch is named after the nearest Git version branch.
git -C "$ORCA_SUT_DIR" rev-parse --abbrev-ref HEAD
Expand Down
17 changes: 17 additions & 0 deletions bin/travis/self-test/_includes.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/usr/bin/env bash

# NAME
# _includes.sh - Include reusable code.
#
# SYNOPSIS
# cd "$(dirname "$0")" || exit; source _includes.sh
#
# DESCRIPTION
# Includes common features used by the Travis CI scripts.

source ../_includes.sh

if [[ "$ORCA_JOB" = "LIVE_TEST" ]]; then
unset ORCA_PACKAGES_CONFIG
unset ORCA_PACKAGES_CONFIG_ALTER
fi
2 changes: 1 addition & 1 deletion bin/travis/self-test/before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# DESCRIPTION
# Places an example SUT.

cd "$(dirname "$0")"; source ../_includes.sh
cd "$(dirname "$0")"; source _includes.sh

(
cd ../../../
Expand Down
17 changes: 17 additions & 0 deletions bin/travis/self-test/install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/usr/bin/env bash

# NAME
# install.sh - Create the test fixture.
#
# SYNOPSIS
# install.sh
#
# DESCRIPTION
# Creates the test fixture and places the SUT.

cd "$(dirname "$0")" || exit; source _includes.sh

if [[ "$ORCA_JOB" = "LIVE_TEST" ]]; then
orca debug:packages CURRENT_RECOMMENDED
orca fixture:init -f --core=CURRENT_RECOMMENDED
fi
6 changes: 5 additions & 1 deletion bin/travis/self-test/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# DESCRIPTION
# Runs static code analysis and automated tests on ORCA itself.

cd "$(dirname "$0")"; source ../_includes.sh
cd "$(dirname "$0")"; source _includes.sh

if [[ "$ORCA_JOB" = "STATIC_CODE_ANALYSIS" ]]; then
(
Expand All @@ -21,3 +21,7 @@ if [[ "$ORCA_JOB" = "STATIC_CODE_ANALYSIS" ]]; then
./vendor/bin/security-checker security:check
)
fi

if [[ "$ORCA_JOB" = "LIVE_TEST" ]]; then
orca qa:automated-tests
fi
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
"symfony/process": "^4.1",
"symfony/yaml": "^4.1",
"vaimo/binary-chromedriver": "^5.0",
"weitzman/drupal-test-traits": "~1.0",
"zumba/amplitude-php": "^1.0"
},
"conflict": {
Expand Down
Loading

0 comments on commit 7f38c2e

Please sign in to comment.