Merge pull request #176 from owncloud/update-drone-star-20210906

Update .drone.star and drop PHP 7.2
owncloud · Sep 6, 2021 · e02c1d3 · e02c1d3
2 parents 85f8f87 + 1e93f10
commit e02c1d3
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 38 deletions.
diff --git a/.drone.star b/.drone.star
@@ -27,7 +27,7 @@ config = {
     "phpunit": {
         "allDatabases": {
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
             "databases": [
                 "mariadb:10.2",
@@ -39,7 +39,7 @@ config = {
         },
         "codecov": {
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
             "databases": [
                 "sqlite",
@@ -48,7 +48,6 @@ config = {
         },
         "reducedDatabases": {
             "phpVersions": [
-                "7.3",
                 "7.4",
             ],
             "databases": [
@@ -143,7 +142,7 @@ def codestyle(ctx):
         return pipelines
 
     default = {
-        "phpVersions": ["7.2"],
+        "phpVersions": ["7.3"],
     }
 
     if "defaults" in config:
@@ -308,7 +307,7 @@ def phpstan(ctx):
         return pipelines
 
     default = {
-        "phpVersions": ["7.2"],
+        "phpVersions": ["7.3"],
         "logLevel": "2",
         "extraApps": {},
         "enableApp": True,
@@ -385,7 +384,7 @@ def phan(ctx):
         return pipelines
 
     default = {
-        "phpVersions": ["7.2", "7.3", "7.4"],
+        "phpVersions": ["7.3", "7.4"],
     }
 
     if "defaults" in config:
@@ -456,7 +455,7 @@ def build(ctx):
         return pipelines
 
     default = {
-        "phpVersions": ["7.2"],
+        "phpVersions": ["7.3"],
         "commands": [
             "make dist",
         ],
@@ -600,7 +599,7 @@ def javascript(ctx, withCoverage):
                  [
                      {
                          "name": "js-tests",
-                         "image": "owncloudci/php:8.0",
+                         "image": "owncloudci/nodejs:%s" % getNodeJsVersion(),
                          "pull": "always",
                          "environment": params["extraEnvironment"],
                          "commands": params["extraCommandsBeforeTestRun"] + [
@@ -655,7 +654,7 @@ def phpTests(ctx, testType, withCoverage):
     errorFound = False
 
     default = {
-        "phpVersions": ["7.2", "7.3", "7.4"],
+        "phpVersions": ["7.3", "7.4"],
         "databases": [
             "sqlite",
             "mariadb:10.2",
@@ -852,7 +851,7 @@ def acceptance(ctx):
     default = {
         "servers": ["daily-master-qa", "latest"],
         "browsers": ["chrome"],
-        "phpVersions": ["7.2"],
+        "phpVersions": ["7.4"],
         "databases": ["mariadb:10.2"],
         "esVersions": ["none"],
         "federatedServerNeeded": False,
@@ -933,7 +932,7 @@ def acceptance(ctx):
                 params["extraSetup"] = [
                     {
                         "name": "configure-app",
-                        "image": "owncloudci/php:7.2",
+                        "image": "owncloudci/php:7.4",
                         "pull": "always",
                         "commands": [
                             "cd /var/www/owncloud/server/apps/files_primary_s3",
@@ -1513,6 +1512,13 @@ def getDbDatabase(db):
 
     return "owncloud"
 
+def getNodeJsVersion():
+    if "nodeJsVersion" not in config:
+        # We use nodejs 14 as the default
+        return "14"
+    else:
+        return config["nodeJsVersion"]
+
 def cacheRestore():
     return [{
         "name": "cache-restore",
@@ -1637,7 +1643,7 @@ def installApp(ctx, phpVersion):
     return [
         {
             "name": "install-app-js-%s" % config["app"],
-            "image": "owncloudci/nodejs:%s" % config["nodeVersion"],
+            "image": "owncloudci/nodejs:%s" % getNodeJsVersion(),
             "pull": "always",
             "commands": [
                 "cd /var/www/owncloud/server/apps/%s" % config["app"],
@@ -1690,7 +1696,7 @@ def setupCeph(serviceParams):
 
     return [{
         "name": "setup-ceph",
-        "image": "owncloudci/php:7.2",
+        "image": "owncloudci/php:7.4",
         "pull": "always",
         "commands": setupCommands + ([
             "./apps/files_primary_s3/tests/drone/create-bucket.sh",
@@ -1718,7 +1724,7 @@ def setupScality(serviceParams):
 
     return [{
         "name": "setup-scality",
-        "image": "owncloudci/php:7.2",
+        "image": "owncloudci/php:7.4",
         "pull": "always",
         "commands": setupCommands + ([
             "php occ s3:create-bucket owncloud --accept-warning",
@@ -1733,7 +1739,7 @@ def setupElasticSearch(esVersion):
 
     return [{
         "name": "setup-es",
-        "image": "owncloudci/php:7.2",
+        "image": "owncloudci/php:7.4",
         "pull": "always",
         "commands": [
             "cd %s" % dir["server"],
@@ -2013,7 +2019,7 @@ def phplint(ctx):
 def installNPM():
     return [{
         "name": "npm-install",
-        "image": "owncloudci/nodejs:12",
+        "image": "owncloudci/nodejs:%s" % getNodeJsVersion(),
         "pull": "always",
         "commands": [
             "yarn install --frozen-lockfile",
@@ -2023,7 +2029,7 @@ def installNPM():
 def lintTest():
     return [{
         "name": "lint-test",
-        "image": "owncloudci/php:7.2",
+        "image": "owncloudci/php:7.4",
         "pull": "always",
         "commands": [
             "make test-lint",

diff --git a/Makefile b/Makefile
@@ -3,14 +3,7 @@ SHELL := /bin/bash
 YARN := $(shell command -v yarn 2> /dev/null)
 NODE_PREFIX=$(shell pwd)
 COMPOSER_BIN := $(shell command -v composer 2> /dev/null)
-ifndef COMPOSER_BIN
-    $(error composer is not available on your system, please install composer)
-endif
-
 NPM := $(shell command -v npm 2> /dev/null)
-ifndef NPM
-    $(error npm is not available on your system, please install npm)
-endif
 
 # bin file definitions
 PHPUNIT=php -d zend.enable_gc=0  "$(PWD)/../../lib/composer/bin/phpunit"

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -31,7 +31,7 @@ More information on setup, configuration and migration can be found in the ownCl
     <screenshot>https://raw.githubusercontent.com/owncloud/screenshots/master/openidconnect/openidconnect.png</screenshot>
     <dependencies>
         <owncloud min-version="10" max-version="10"/>
-        <php min-version="7.1" />
+        <php min-version="7.3" />
     </dependencies>
     <types>
         <authentication/>

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "OpenId Connect app for ownCloud",
     "require": {
-        "php": ">=7.1",
+        "php": ">=7.3",
         "jumbojett/openid-connect-php": "^0.9.0"
     },
     "require-dev": {
@@ -25,7 +25,7 @@
         "optimize-autoloader": true,
         "classmap-authoritative": false,
         "platform": {
-            "php": "7.1"
+            "php": "7.3"
         }
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -29,5 +29,5 @@ sonar.pullrequest.branch=${env.SONAR_PULL_REQUEST_BRANCH}
 sonar.pullrequest.key=${env.SONAR_PULL_REQUEST_KEY}
 
 # Properties specific to language plugins:
-sonar.php.coverage.reportPaths=results/clover-phpunit-php7.2-sqlite.xml
+sonar.php.coverage.reportPaths=results/clover-phpunit-php7.3-sqlite.xml
 sonar.javascript.lcov.reportPaths=results/lcov.info