diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-10-04 18:35:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-04 18:35:20 +0300 |
| commit | 7d7daed49eeeb6c0056776c4fa4d5a9f492906b6 (patch) | |
| tree | 7d425eb2c844bc24f170e9618938a46b2ed06c00 | |
| parent | 118e86f3ce3f73da59a4ce11234bd0c4f94ab625 (diff) | |
| parent | 9e28fb8a3dcd7741d088cab3e1c4ff0593913651 (diff) | |
Merge pull request #11590 from nextcloud/version/noid/12.0.12RC1v12.0.12RC112.0.12RC1
12.0.12 RC 1
| -rw-r--r-- | .drone.yml | 3 | ||||
| -rw-r--r-- | version.php | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.drone.yml b/.drone.yml index e90713b285b..eb301c18a48 100644 --- a/.drone.yml +++ b/.drone.yml @@ -197,7 +197,7 @@ pipeline: image: nextcloudci/php5.6:php5.6-8 commands: - sleep 10 # gives the database enough time to initialize - - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql + - POSTGRES=${POSTGRES} NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql when: matrix: DB: postgres @@ -649,6 +649,7 @@ services: image: postgres:9 environment: - POSTGRES_USER=oc_autotest + - POSTGRES_DB=oc_autotest_dummy - POSTGRES_PASSWORD=owncloud tmpfs: - /var/lib/postgresql/data diff --git a/version.php b/version.php index cf69f07b035..c7df9be4ae4 100644 --- a/version.php +++ b/version.php @@ -26,10 +26,10 @@ // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = array(12, 0, 11, 1); +$OC_Version = array(12, 0, 12, 0); // The human readable string -$OC_VersionString = '12.0.11'; +$OC_VersionString = '12.0.12 RC 1'; $OC_VersionCanBeUpgradedFrom = [ 'nextcloud' => [ |