Merge branch 'master' into chore/upgrade_psalm

pull/301/head
Sébastien Marinier 2024-10-25 18:00:15 +02:00 committed by GitHub
commit 5a0aad717e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 21 additions and 12 deletions

View File

@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
php-versions: [7.4, 8.0, 8.1] php-versions: [8.0, 8.1, 8.2]
name: php${{ matrix.php-versions }} lint name: php${{ matrix.php-versions }} lint
steps: steps:
- name: Checkout - name: Checkout

View File

@ -11,15 +11,9 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3'] php-versions: ['8.0', '8.1', '8.2', '8.3']
nextcloud-versions: ['stable25', 'stable26', 'stable27', 'stable28'] nextcloud-versions: ['stable26', 'stable27', 'stable28']
exclude: exclude:
- php-versions: '7.4'
nextcloud-versions: 'stable26'
- php-versions: '7.4'
nextcloud-versions: 'stable27'
- php-versions: '7.4'
nextcloud-versions: 'stable28'
- php-versions: '8.2' - php-versions: '8.2'
nextcloud-versions: 'stable25' nextcloud-versions: 'stable25'
- php-versions: '8.3' - php-versions: '8.3'

View File

@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
ocp-version: [ '^28', '^27', '^26', '^25'] ocp-version: [ '^28', '^27', '^26']
name: Nextcloud ${{ matrix.ocp-version }} name: Nextcloud ${{ matrix.ocp-version }}
steps: steps:
- name: Checkout - name: Checkout

View File

@ -62,8 +62,11 @@ clean:
clean-dev: clean-dev:
rm -rf node_modules rm -rf node_modules
git checkout composer.json
git checkout composer.lock
rm -rf vendor
pack: pack: install-composer-deps
mkdir -p archive mkdir -p archive
tar --exclude='./Makefile' --exclude='./webpack*' --exclude='./.*' --exclude='./ts' --exclude='./tests' --exclude='./node_modules' --exclude='./archive' -zcvf ./archive/cloud_bbb.tar.gz . --transform s/^./bbb/ tar --exclude='./Makefile' --exclude='./webpack*' --exclude='./.*' --exclude='./ts' --exclude='./tests' --exclude='./node_modules' --exclude='./archive' -zcvf ./archive/cloud_bbb.tar.gz . --transform s/^./bbb/

View File

@ -44,7 +44,7 @@ Contributors are welcome! If you have time it would be awesome if you could help
<lib>curl</lib> <lib>curl</lib>
<lib>mbstring</lib> <lib>mbstring</lib>
<lib>SimpleXML</lib> <lib>SimpleXML</lib>
<nextcloud min-version="25" max-version="28"/> <nextcloud min-version="26" max-version="28"/>
</dependencies> </dependencies>
<commands> <commands>
<command>OCA\BigBlueButton\Command\ClearAvatarCache</command> <command>OCA\BigBlueButton\Command\ClearAvatarCache</command>

View File

@ -1,4 +1,11 @@
/* eslint-disable @typescript-eslint/no-var-requires */ /* eslint-disable @typescript-eslint/no-var-requires */
/**
* npm run release:build [--dry-run] [--stable]
*
* --dry-run don't commit CHANGELOG.md
* --stable generate changelog
*
*/
const colors = require('colors'); const colors = require('colors');
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
@ -155,6 +162,11 @@ async function commitChangeLog() {
function createArchive(appId, fileBaseName) { function createArchive(appId, fileBaseName) {
const archivesPath = path.normalize(__dirname + '/../archives/');
if (!fs.existsSync(archivesPath)){
fs.mkdirSync(archivesPath);
}
const fileName = `${fileBaseName}.tar.gz`; const fileName = `${fileBaseName}.tar.gz`;
const filePath = path.normalize(__dirname + `/../archives/${fileName}`); const filePath = path.normalize(__dirname + `/../archives/${fileName}`);
const output = fs.createWriteStream(filePath); const output = fs.createWriteStream(filePath);