Skip to content

Commit

Permalink
Revert to old testing container for now
Browse files Browse the repository at this point in the history
  • Loading branch information
kevincupp committed Nov 1, 2018
1 parent c06b7a0 commit 65de381
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
apk upgrade
apk add bash
- run: chmod +x ./eetools
- run: bash ./eetools circleci -p 5.6.0
- run: bash ./eetools circleci -p 5.6.32
- store_artifacts:
path: /tmp/artifacts
test_php_72:
test_php_71:
docker:
- image: docker:stable-git
steps:
Expand All @@ -33,7 +33,7 @@ jobs:
apk upgrade
apk add bash
- run: chmod +x ./eetools
- run: bash ./eetools circleci -p 7.2.11
- run: bash ./eetools circleci -p 7.1.11
- store_artifacts:
path: /tmp/artifacts

Expand All @@ -42,4 +42,4 @@ workflows:
build_and_test:
jobs:
- test_php_56
- test_php_72
- test_php_71
2 changes: 1 addition & 1 deletion eetools
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ git archive --format=tar -o ee.tar $STASH_NAME
# Absolutely have to have the git folder available in the archive?
#tar --append --file=ee.tar .git

IMAGE_NAME="ellislab/eecms-test:latest"
IMAGE_NAME="ellislab/eecms-test:old"
VOLUME_ID=`docker volume create`
HELPER_CONTAINER_ID=`docker create -v $VOLUME_ID:/app $IMAGE_NAME /bin/true`

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public function testOfFile($description, $in, $out, $exception)
public function ofFileDataProvider()
{
$xml_mime = 'text/xml';
if (version_compare(PHP_VERSION, '7.0', '<'))
if (version_compare(PHP_VERSION, '7.2', '<'))
{
$xml_mime = 'application/xml';
}
Expand Down Expand Up @@ -290,7 +290,7 @@ public function testOfBuffer($description, $in, $out)
public function ofBufferDataProvider()
{
$random_mime = 'application/octet-stream';
if (version_compare(PHP_VERSION, '7.0', '<'))
if (version_compare(PHP_VERSION, '5.6.32', '<'))
{
$random_mime = 'binary';
}
Expand Down
2 changes: 1 addition & 1 deletion tests/docker/runtests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ while [[ $# > 0 ]]
key="$1"

# Default PHP version
PHP_VERSION="7.2.11"
PHP_VERSION="7.1.11"

case $key in
-p|--php)
Expand Down

0 comments on commit 65de381

Please sign in to comment.