Skip to content

use PHP 8.0 image for master integration tests #583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 6 commits into from
Apr 7, 2022
Merged

use PHP 8.0 image for master integration tests #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8f212c5
use PHP 8.0 image for master integration tests
blizzz Mar 1, 2022
3435d50
update behat and deps
blizzz Mar 2, 2022
98c8176
add missing integration test vendor files
blizzz Mar 2, 2022
9d28b8d
attempt to make start jetty reliably
blizzz Mar 2, 2022
8e91cf2
psr/container >= 1.1 breaks Symfony on PHP 7.3
blizzz Mar 9, 2022
3ecd49e
wait for services on older images, too
blizzz Mar 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
29 changes: 15 additions & 14 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,22 @@ clone:

steps:
- name: integration-tests-master
image: nextcloudci/user_saml_shibboleth-php7.3:user_saml_shibboleth_php7.3-2
image: ghcr.io/nextcloud/continuous-integration-user_saml_shibboleth-php8.0:latest
environment:
CORE_BRANCH: master
commands:
- /start.sh &
- sleep 7
- /start.sh
- /wait-for-services.sh
- rm -rf /var/www/html
- cd /var/www/
- git clone --depth 1 -b $CORE_BRANCH https://github.com/nextcloud/server html
- cd /var/www/html && git submodule update --init
# use local clone
- cp -r /drone/src /var/www/html/apps/user_saml
- scl enable rh-php73 "bash -c 'php /var/www/html/occ maintenance:install --database sqlite --admin-pass password; php /var/www/html/occ app:enable user_saml'"
- php /var/www/html/occ maintenance:install --database sqlite --admin-pass password
- php /var/www/html/occ app:enable user_saml
- chown -R apache:apache /var/www/html/
- scl enable rh-php73 "bash -c 'cd /var/www/html/apps/user_saml/tests/integration && vendor/bin/behat'"
- cd /var/www/html/apps/user_saml/tests/integration && vendor/bin/behat

trigger:
branch:
Expand All @@ -40,13 +41,13 @@ clone:
depth: 1

steps:
- name: integration-tests-master
image: nextcloudci/user_saml_shibboleth-php7.3:user_saml_shibboleth_php7.3-2
- name: integration-tests-stable23
image: ghcr.io/nextcloud/continuous-integration-user_saml_shibboleth-php7.3:latest
environment:
CORE_BRANCH: stable23
commands:
- /start.sh &
- sleep 7
- /wait-for-services.sh
- rm -rf /var/www/html
- cd /var/www/
- git clone --depth 1 -b $CORE_BRANCH https://github.com/nextcloud/server html
Expand Down Expand Up @@ -75,13 +76,13 @@ clone:
depth: 1

steps:
- name: integration-tests-master
image: nextcloudci/user_saml_shibboleth-php7.3:user_saml_shibboleth_php7.3-2
- name: integration-tests-stable22
image: ghcr.io/nextcloud/continuous-integration-user_saml_shibboleth-php7.3:latest
environment:
CORE_BRANCH: stable22
commands:
- /start.sh &
- sleep 7
- /wait-for-services.sh
- rm -rf /var/www/html
- cd /var/www/
- git clone --depth 1 -b $CORE_BRANCH https://github.com/nextcloud/server html
Expand Down Expand Up @@ -110,13 +111,13 @@ clone:
depth: 1

steps:
- name: integration-tests-master
image: nextcloudci/user_saml_shibboleth-php7.3:user_saml_shibboleth_php7.3-2
- name: integration-tests-stable21
image: ghcr.io/nextcloud/continuous-integration-user_saml_shibboleth-php7.3:latest
environment:
CORE_BRANCH: stable21
commands:
- /start.sh &
- sleep 7
- /wait-for-services.sh
- rm -rf /var/www/html
- cd /var/www/
- git clone --depth 1 -b $CORE_BRANCH https://github.com/nextcloud/server html
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@
3rdparty/vendor/onelogin/php-saml/endpoints/

build
vendor
/vendor/
.php_cs.cache

!/tests/integration/
6 changes: 6 additions & 0 deletions tests/integration/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{
"require": {
"php": ">=7.3"
},
"require-dev": {
"behat/behat": "^3.3",
"guzzlehttp/guzzle": "^7.0"
},
"conflict": {
"psr/container": ">=1.1"
}
}
Loading