Merge pull request #390 from kyrofa/release/12.0.4snap1

Release 12.0.4snap1
nextcloud-snap · Dec 12, 2017 · c53da15 · c53da15
2 parents 1d6fe38 + 0e6ac2d
commit c53da15
Show file tree

Hide file tree

Showing 6 changed files with 131 additions and 29 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -20,18 +20,97 @@ jobs:
            sudo nextcloud.manual-install admin admin
 
      - run:
-         # Install the test gems and run the tests
-         command: |
-           # Install dependencies for the gems
-           sudo apt install qt5-default libqt5webkit5-dev xvfb -y
-           # In order to use rvm, we need a login shell. We need to install
-           # Ruby v2.4.0 (the older version that is the default doesn't handle
-           # the redirection that we test)
-           bash --login -c '
-               rvm install 2.4.0
-               rvm use 2.4.0
-               cd tests
-               gem install bundler
-               bundle install --deployment
-               bundle exec rake test
-           '
+         # Run the tests
+         command: ./.circleci/runtests.sh
+
+  test-daily-master:
+    working_directory: ~/nextcloud-snap
+    machine: true
+    steps:
+      - checkout
+
+      - run:
+          # Install the snap and create an admin user
+          command: |
+            sudo apt update
+            sudo apt install -y snapd
+            sudo snap install --edge nextcloud
+            sudo nextcloud.manual-install admin admin
+
+      - run:
+          # Run the tests
+          command: ./.circleci/runtests.sh
+
+  test-daily-v12:
+    working_directory: ~/nextcloud-snap
+    machine: true
+    steps:
+      - checkout
+
+      - run:
+          # Install the snap and create an admin user
+          command: |
+            sudo apt update
+            sudo apt install -y snapd
+            sudo snap install nextcloud --channel=12/edge
+            sudo nextcloud.manual-install admin admin
+
+      - run:
+          # Run the tests
+          command: ./.circleci/runtests.sh
+
+  test-daily-v11:
+    working_directory: ~/nextcloud-snap
+    machine: true
+    steps:
+      - checkout
+
+      - run:
+          # Install the snap and create an admin user
+          command: |
+            sudo apt update
+            sudo apt install -y snapd
+            sudo snap install nextcloud --channel=11/edge
+            sudo nextcloud.manual-install admin admin
+
+      - run:
+          # Run the tests
+          command: ./.circleci/runtests.sh
+
+workflows:
+  version: 2
+  commit:
+    jobs: [build]
+
+  daily-master:
+    triggers:
+      - schedule:
+          # 0700 UTC == 0000 PSC
+          cron: "0 7 * * *"
+          filters:
+            branches:
+              only: develop
+
+    jobs: [test-daily-master]
+
+  daily-v12:
+    triggers:
+      - schedule:
+          # 0700 UTC == 0000 PSC
+          cron: "0 7 * * *"
+          filters:
+            branches:
+              only: develop
+
+    jobs: [test-daily-v12]
+
+  daily-v11:
+    triggers:
+      - schedule:
+          # 0700 UTC == 0000 PSC
+          cron: "0 7 * * *"
+          filters:
+            branches:
+              only: develop
+
+    jobs: [test-daily-v11]
diff --git a/.circleci/runtests.sh b/.circleci/runtests.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# Install dependencies for the gems
+sudo apt install qt5-default libqt5webkit5-dev xvfb -y
+
+# In order to use rvm, we need a login shell. We need to install
+# Ruby v2.4.0 (the older version that is the default doesn't handle
+# the redirection that we test)
+bash --login -c '
+    rvm install 2.4.0
+    rvm use 2.4.0
+    cd tests
+    gem install bundler
+    bundle install --deployment
+    bundle exec rake test
+'
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+v 12.0.4snap1
+  - nextcloud: update to 12.0.4
+  - php: update to 7.0.25
+  - CI: test daily snaps on a daily basis
+
 v 11.0.5snap2
   - php: support changing memory limit
   - apache: update to 2.4.28

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 Nextcloud server packaged as a snap. It consists of:
 
-- Nextcloud 11.0.5
+- Nextcloud 12.0.4
 - Apache 2.4
 - PHP 7
 - MySQL 5.7

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: nextcloud
-version: 11.0.5snap2
+version: 12.0.4snap1
 summary: Nextcloud Server - A safe home for all your data
 description: |
  Access, share and protect your files, calendars, contacts, communication and
@@ -138,8 +138,8 @@ parts:
 
   nextcloud:
     plugin: dump
-    source: https://download.nextcloud.com/server/releases/nextcloud-11.0.5.tar.bz2
-    source-checksum: sha256/47261211384e63b1d4816be60817b0315029d018b5568ac3aeb3181be5fb98a4
+    source: https://download.nextcloud.com/server/releases/nextcloud-12.0.4.tar.bz2
+    source-checksum: sha256/654161a74ceaf9a60c7731d7d6702e6710a972633a97955d16f01abeb09d09b6
     organize:
       '*': htdocs/
       '.htaccess': htdocs/.htaccess
@@ -152,8 +152,8 @@ parts:
 
   php:
     plugin: php
-    source: http://us2.php.net/get/php-7.0.23.tar.bz2/from/this/mirror
-    source-checksum: sha256/6fe94cefc7d2c60ee2c1648b977beed756ad9cd0a7e4ea8bb8cf521d9355a09c
+    source: http://us2.php.net/get/php-7.0.25.tar.bz2/from/this/mirror
+    source-checksum: sha256/95a24d96d126a196e1550e394182b43a6460cdd2026f1a77bef01e422415cc25
     source-type: tar
     install-via: prefix
     configflags:

diff --git a/src/php/config/php.ini b/src/php/config/php.ini
@@ -1732,21 +1732,23 @@ ldap.max_links = -1
 ;dba.default_handler=
 
 [opcache]
+zend_extension=opcache.so
+
 ; Determines if Zend OPCache is enabled
-;opcache.enable=0
+opcache.enable=1
 
 ; Determines if Zend OPCache is enabled for the CLI version of PHP
-;opcache.enable_cli=0
+opcache.enable_cli=1
 
 ; The OPcache shared memory storage size.
-;opcache.memory_consumption=64
+opcache.memory_consumption=128
 
 ; The amount of memory for interned strings in Mbytes.
-;opcache.interned_strings_buffer=4
+opcache.interned_strings_buffer=8
 
 ; The maximum number of keys (scripts) in the OPcache hash table.
 ; Only numbers between 200 and 100000 are allowed.
-;opcache.max_accelerated_files=2000
+opcache.max_accelerated_files=10000
 
 ; The maximum percentage of "wasted" memory until a restart is scheduled.
 ;opcache.max_wasted_percentage=5
@@ -1759,19 +1761,19 @@ ldap.max_links = -1
 
 ; When disabled, you must reset the OPcache manually or restart the
 ; webserver for changes to the filesystem to take effect.
-;opcache.validate_timestamps=1
+opcache.validate_timestamps=0
 
 ; How often (in seconds) to check file timestamps for changes to the shared
 ; memory storage allocation. ("1" means validate once per second, but only
 ; once per request. "0" means always validate)
-;opcache.revalidate_freq=2
+opcache.revalidate_freq=1
 
 ; Enables or disables file search in include_path optimization
 ;opcache.revalidate_path=0
 
 ; If disabled, all PHPDoc comments are dropped from the code to reduce the
 ; size of the optimized code.
-;opcache.save_comments=1
+opcache.save_comments=1
 
 ; If enabled, a fast shutdown sequence is used for the accelerated code
 ;opcache.fast_shutdown=0