Skip to content

Commit d94a54e

Browse files
committed
Merge branch 'cms_pico-1.0' into pr-242
2 parents f9783d7 + 74c4486 commit d94a54e

5 files changed

Lines changed: 76 additions & 75 deletions

File tree

.github/workflows/test.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@ jobs:
1616
permissions: {}
1717

1818
env:
19-
RUN_ON: "NEXTCLOUD_STABLE25 NEXTCLOUD_MASTER"
20-
NEXTCLOUD_STABLE25_BRANCH: "releases/latest-25"
21-
NEXTCLOUD_STABLE25_PHP_VERSIONS: "7.4 8.0 8.1"
19+
RUN_ON: "NEXTCLOUD_STABLE26 NEXTCLOUD_STABLE27 NEXTCLOUD_MASTER"
20+
NEXTCLOUD_STABLE26_BRANCH: "releases/latest-26"
21+
NEXTCLOUD_STABLE26_PHP_VERSIONS: "8.0 8.1 8.2"
22+
NEXTCLOUD_STABLE27_BRANCH: "releases/latest-27"
23+
NEXTCLOUD_STABLE27_PHP_VERSIONS: "8.0 8.1 8.2"
2224
NEXTCLOUD_MASTER_BRANCH: "daily/latest-master"
23-
NEXTCLOUD_MASTER_PHP_VERSIONS: "7.4 8.0 8.1"
25+
NEXTCLOUD_MASTER_PHP_VERSIONS: "8.0 8.1 8.2"
2426

2527
outputs:
2628
BUILD_MATRIX_NEXTCLOUD: ${{ steps.generate-jobs.outputs.BUILD_MATRIX_NEXTCLOUD }}
@@ -126,7 +128,7 @@ jobs:
126128
echo "NEXTCLOUD_VERSION=$NEXTCLOUD_VERSION" | tee -a "$GITHUB_ENV"
127129
128130
- name: Cache Nextcloud ${{ env.NEXTCLOUD_VERSION }}
129-
uses: actions/cache@v2
131+
uses: actions/cache@v3
130132
with:
131133
path: ~/nextcloud
132134
key: ${{ matrix.NEXTCLOUD_CACHE }}
@@ -153,16 +155,17 @@ jobs:
153155

154156
steps:
155157
- name: Checkout repository
156-
uses: actions/checkout@v2
158+
uses: actions/checkout@v4
157159

158160
- name: Setup PHP ${{ matrix.PHP_VERSION }}
159161
uses: shivammathur/setup-php@v2
160162
with:
161163
php-version: ${{ matrix.PHP_VERSION }}
164+
extensions: gd, sqlite
162165
tools: composer
163166

164167
- name: Restore cached Nextcloud
165-
uses: actions/cache@v2
168+
uses: actions/cache@v3
166169
with:
167170
path: ~/nextcloud
168171
key: ${{ matrix.NEXTCLOUD_CACHE }}
@@ -184,7 +187,7 @@ jobs:
184187
echo "COMPOSER_CACHE_DIR=$COMPOSER_CACHE_DIR" | tee -a "$GITHUB_ENV"
185188
186189
- name: Restore Composer cache
187-
uses: actions/cache@v2
190+
uses: actions/cache@v3
188191
with:
189192
path: ${{ env.COMPOSER_CACHE_DIR }}
190193
key: ${{ runner.os }}-composer-php${{ matrix.PHP_VERSION }}-${{ hashFiles('composer.lock') }}

.scrutinizer.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ build:
1111
analysis:
1212
environment:
1313
php:
14-
version: 7.4
15-
compile_options: '--enable-gd --with-openssl --with-curl --with-pdo-mysql --with-mysqli --with-freetype --enable-mbstring --enable-mbregex --enable-exif --enable-bcmath --with-mhash --with-xmlrpc --with-xsl --enable-opcache --enable-intl --with-pear --with-gettext --enable-fpm --with-zlib-dir --with-zlib --disable-rpath --enable-inline-optimization --with-bz2 --with-zlib --enable-sockets --enable-sysvsem --enable-sysvshm --enable-pcntl'
16-
pecl_extensions:
17-
- xdebug-2.9.8
14+
version: 8.1
1815
dependencies:
1916
override:
2017
- curl -L -o ~/nextcloud.tar.bz2 --insecure https://download.nextcloud.com/server/$NEXTCLOUD.tar.bz2

appinfo/info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ You want to learn more about Pico CMS for Nextcloud? Easy! Just download and ena
4747
<screenshot>https://raw.githubusercontent.com/nextcloud/cms_pico/master/screenshots/settings.png</screenshot>
4848
<screenshot>https://raw.githubusercontent.com/nextcloud/cms_pico/master/screenshots/apache.png</screenshot>
4949
<dependencies>
50-
<php min-version="7.3.0"/>
51-
<nextcloud min-version="25" max-version="25"/>
50+
<php min-version="8.0.0"/>
51+
<nextcloud min-version="26" max-version="27"/>
5252
</dependencies>
5353
<repair-steps>
5454
<post-migration>

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020
},
2121
"require": {
22-
"php": ">=7.3.0",
22+
"php": ">=8.0.0",
2323
"ext-json": "*",
2424
"picocms/pico": "^2.1",
2525
"picocms/pico-theme": "^2.1",

0 commit comments

Comments
 (0)