From 33fe41e86a72f1ba39b4002cb54a62f197da45bd Mon Sep 17 00:00:00 2001 From: Benjamin Brahmer Date: Tue, 3 May 2022 18:38:00 +0200 Subject: Update php version and disable code check Signed-off-by: Benjamin Brahmer --- .github/workflows/api-integration-tests.yml | 6 +++++- .github/workflows/api-php-static-code-check.yml | 8 ++++++-- .github/workflows/api-php-tests.yml | 6 +++--- .github/workflows/build-release.yml | 4 ++-- .github/workflows/frontend-nodejs-tests.yml | 6 +++--- .github/workflows/post-merge-tasks.yml | 6 +++--- 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/.github/workflows/api-integration-tests.yml b/.github/workflows/api-integration-tests.yml index 310b1527b..c9a1d4cc9 100644 --- a/.github/workflows/api-integration-tests.yml +++ b/.github/workflows/api-integration-tests.yml @@ -41,6 +41,10 @@ jobs: nextcloud: pre-release database: sqlite experimental: true + - php-versions: 8.1 + nextcloud: stable24 + database: sqlite + experimental: false steps: - name: Checkout uses: actions/checkout@v3 @@ -101,7 +105,7 @@ jobs: uses: SMillerDev/nextcloud-actions/setup-nextcloud-app@main with: app: 'news' - check-code: ${{ matrix.experimental }} == false + check-code: false force: ${{ matrix.experimental }} - name: Setup problem matchers for PHP diff --git a/.github/workflows/api-php-static-code-check.yml b/.github/workflows/api-php-static-code-check.yml index a8c16ca7b..662aec0a1 100644 --- a/.github/workflows/api-php-static-code-check.yml +++ b/.github/workflows/api-php-static-code-check.yml @@ -8,9 +8,13 @@ jobs: strategy: matrix: php-versions: [ '7.4', '8.0' ] - nextcloud: [ 'stable23' ] + nextcloud: [ 'stable24' ] database: [ 'sqlite' ] include: + - php-versions: 8.1 + nextcloud: stable24 + database: sqlite + experimental: false - php-versions: 8.1 nextcloud: pre-release database: sqlite @@ -40,7 +44,7 @@ jobs: uses: SMillerDev/nextcloud-actions/setup-nextcloud-app@main with: app: 'news' - check-code: true + check-code: false force: true - name: Prep code scanning diff --git a/.github/workflows/api-php-tests.yml b/.github/workflows/api-php-tests.yml index e6c8e2eff..b54f8a5a6 100644 --- a/.github/workflows/api-php-tests.yml +++ b/.github/workflows/api-php-tests.yml @@ -9,8 +9,8 @@ jobs: name: "PHP: Nextcloud ${{ matrix.nextcloud }} - PHP ${{ matrix.php-versions }} - DB ${{ matrix.database }}" strategy: matrix: - php-versions: ['8.0'] - nextcloud: ['stable23'] + php-versions: ['8.1'] + nextcloud: ['stable24'] database: ['sqlite'] experimental: [false] steps: @@ -39,7 +39,7 @@ jobs: uses: SMillerDev/nextcloud-actions/setup-nextcloud-app@main with: app: 'news' - check-code: true + check-code: false - name: Setup problem matchers for PHPUnit run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 837b28d51..d82976883 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -14,8 +14,8 @@ jobs: name: "Release: build, sign and upload the app" strategy: matrix: - php-versions: ['8.0'] - nextcloud: ['stable23'] + php-versions: ['8.1'] + nextcloud: ['stable24'] database: ['sqlite'] steps: - name: Checkout diff --git a/.github/workflows/frontend-nodejs-tests.yml b/.github/workflows/frontend-nodejs-tests.yml index a111b0876..d78409ae4 100644 --- a/.github/workflows/frontend-nodejs-tests.yml +++ b/.github/workflows/frontend-nodejs-tests.yml @@ -9,8 +9,8 @@ jobs: name: "Frontend: Nextcloud ${{ matrix.nextcloud }} - PHP ${{ matrix.php-versions }} - DB ${{ matrix.database }}" strategy: matrix: - php-versions: ['8.0'] - nextcloud: ['stable23'] + php-versions: ['8.1'] + nextcloud: ['stable24'] database: ['sqlite'] experimental: [false] steps: @@ -39,7 +39,7 @@ jobs: uses: SMillerDev/nextcloud-actions/setup-nextcloud-app@main with: app: 'news' - check-code: true + check-code: false - name: Install frontend requirements run: sudo apt update && sudo apt install firefox diff --git a/.github/workflows/post-merge-tasks.yml b/.github/workflows/post-merge-tasks.yml index 843b48e76..b431399c7 100644 --- a/.github/workflows/post-merge-tasks.yml +++ b/.github/workflows/post-merge-tasks.yml @@ -10,7 +10,7 @@ jobs: name: "Coverage: Nextcloud PHP ${{ matrix.php-versions }}" strategy: matrix: - nextcloud: ['stable23'] + nextcloud: ['stable24'] steps: - name: Checkout uses: actions/checkout@v3 @@ -18,7 +18,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '7.4' + php-version: '8.1' ### Back to normal setup - name: Set up server non MySQL @@ -35,7 +35,7 @@ jobs: uses: SMillerDev/nextcloud-actions/setup-nextcloud-app@main with: app: 'news' - check-code: true + check-code: false - name: Prep PHP tests run: cd ../server/apps/news && make php-test-dependencies -- cgit v1.2.3