Skip to content

Commit

Permalink
Merge pull request #521 from nextcloud/update-master-to-stable28
Browse files Browse the repository at this point in the history
Make CI run with stable28
  • Loading branch information
individual-it authored Nov 24, 2023
2 parents 1fe2b37 + d390700 commit bf93d41
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ jobs:
name: unit tests and linting
strategy:
matrix:
nextcloudVersion: [ stable25, stable26, stable27, master ]
nextcloudVersion: [ stable25, stable26, stable27, stable28 ]
phpVersion: [ 7.4, 8.0, 8.1 ]
exclude:
- nextcloudVersion: stable26
phpVersion: 7.4
- nextcloudVersion: stable27
phpVersion: 7.4
- nextcloudVersion: master
- nextcloudVersion: stable28
phpVersion: 7.4
runs-on: ubuntu-20.04
steps:
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
- name: PHP code analysis
run: |
if [[ ${{ matrix.nextcloudVersion }} != "master" ]]
if [[ ${{ matrix.nextcloudVersion }} != "stable28" ]]
then
make phpstan
fi
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
make jsunit
- name: JS Code Coverage Summary Report
if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == '8.1' }}
if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'stable28' && matrix.phpVersion == '8.1' }}
uses: romeovs/[email protected]
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -116,14 +116,14 @@ jobs:
title: "JS Code Coverage"

- name: Setup .NET Core # this is required to execute Convert PHP cobertura coverage to lcov step
if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == '8.1' }}
if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'stable28' && matrix.phpVersion == '8.1' }}
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.101
dotnet-quality: 'ga'

- name: Convert PHP cobertura coverage to lcov
if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == '8.1' }}
if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'stable28' && matrix.phpVersion == '8.1' }}
uses: danielpalme/[email protected]
with:
reports: './server/apps/integration_openproject/coverage/php/cobertura.xml' # REQUIRED # The coverage reports that should be parsed (separated by semicolon). Globbing is supported.
Expand All @@ -142,7 +142,7 @@ jobs:
toolpath: 'reportgeneratortool' # Default directory for installing the dotnet tool.

- name: PHP Code Coverage Summary Report
if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == '8.1' }}
if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'stable28' && matrix.phpVersion == '8.1' }}
uses: romeovs/[email protected]
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -151,14 +151,14 @@ jobs:
title: "PHP Code Coverage"

- name: JS coverage check
if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == '8.1' }}
if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'stable28' && matrix.phpVersion == '8.1' }}
uses: VeryGoodOpenSource/very_good_coverage@v2
with:
min_coverage: '59'
path: './server/apps/integration_openproject/coverage/jest/lcov.info'

- name: PHP coverage check
if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == '8.1' }}
if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'stable28' && matrix.phpVersion == '8.1' }}
uses: VeryGoodOpenSource/very_good_coverage@v2
with:
min_coverage: '56'
Expand All @@ -168,7 +168,7 @@ jobs:
name: API tests
strategy:
matrix:
nextcloudVersion: [ stable25, stable26, stable27, master ]
nextcloudVersion: [ stable25, stable26, stable27, stable28 ]
phpVersionMajor: [ 7, 8 ]
phpVersionMinor: [ 4, 1 ]
database: [pgsql, mysql]
Expand All @@ -189,7 +189,7 @@ jobs:
phpVersionMinor: 1
- phpVersionMajor: 8
phpVersionMinor: 4
- nextcloudVersion: master
- nextcloudVersion: stable28
phpVersionMajor: 7
- phpVersionMajor: 7
phpVersionMinor: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
sudo apt install make openssl -y
echo "###### installing nextcloud"
mkdir ~/html
git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b master ~/html/nextcloud
git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b stable28 ~/html/nextcloud
sed -i $'s|if (substr($fullPath, 0, strlen($root) + 1) === $root . \'/\')|if (is_string($root) and substr($fullPath, 0, strlen($root) + 1) === $root . \'/\')|g' ~/html/nextcloud/lib/autoloader.php
cp -r $GITHUB_WORKSPACE ~/html/nextcloud/apps/${APP_ID}
php ~/html/nextcloud/occ maintenance:install --database "sqlite" --admin-user "admin" --admin-pass "password"
Expand Down

0 comments on commit bf93d41

Please sign in to comment.