ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

chore(CI): Update master php testing versions and workflow templates

Browse Source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling
2023-01-16 15:28:09 +01:00
parent 5ec251e8cd
commit 1efd06f2b6
8 changed files with 96 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
.github/workflows/appstore-build-publish.yml vendored
View File

@@ -10,7 +10,7 @@ on:
types: [published] types: [published]
env: env:
PHP_VERSION: 7.4 PHP_VERSION: 8.1
jobs: jobs:
build_and_publish: build_and_publish:
@@ -21,42 +21,42 @@ jobs:
steps: steps:
- name: Check actor permission - name: Check actor permission
uses: skjnldsv/check-actor-permission@v2 uses: skjnldsv/check-actor-permission@e591dbfe838300c007028e1219ca82cc26e8d7c5 # v2.1
with: with:
require: write require: write
- name: Set app env - name: Set app env
run: | run: |
# Split and keep last # Split and keep last
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
echo "APP_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV echo "APP_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
with: with:
path: ${{ env.APP_NAME }} path: ${{ env.APP_NAME }}
- name: Get appinfo data - name: Get appinfo data
id: appinfo id: appinfo
uses: skjnldsv/xpath-action@master uses: skjnldsv/xpath-action@7e6a7c379d0e9abc8acaef43df403ab4fc4f770c # master
with: with:
filename: ${{ env.APP_NAME }}/appinfo/info.xml filename: ${{ env.APP_NAME }}/appinfo/info.xml
expression: "//info//dependencies//nextcloud/@min-version" expression: "//info//dependencies//nextcloud/@min-version"
- name: Read package.json node and npm engines version - name: Read package.json node and npm engines version
uses: skjnldsv/read-package-engines-version-actions@v2.0 uses: skjnldsv/read-package-engines-version-actions@1bdcee71fa343c46b18dc6aceffb4cd1e35209c6 # v1.2
id: versions id: versions
# Continue if no package.json # Continue if no package.json
continue-on-error: true continue-on-error: true
with: with:
path: ${{ env.APP_NAME }} path: ${{ env.APP_NAME }}
fallbackNode: "^12" fallbackNode: "^16"
fallbackNpm: "^6" fallbackNpm: "^7"
- name: Set up node ${{ steps.versions.outputs.nodeVersion }} - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
# Skip if no package.json # Skip if no package.json
if: ${{ steps.versions.outputs.nodeVersion }} if: ${{ steps.versions.outputs.nodeVersion }}
uses: actions/setup-node@v3 uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3
with: with:
node-version: ${{ steps.versions.outputs.nodeVersion }} node-version: ${{ steps.versions.outputs.nodeVersion }}
@@ -66,14 +66,16 @@ jobs:
run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}" run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
- name: Set up php ${{ env.PHP_VERSION }} - name: Set up php ${{ env.PHP_VERSION }}
uses: shivammathur/setup-php@2.23.0 uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2
with: with:
php-version: ${{ env.PHP_VERSION }} php-version: ${{ env.PHP_VERSION }}
coverage: none coverage: none
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Check composer.json - name: Check composer.json
id: check_composer id: check_composer
uses: andstor/file-existence-action@v2 uses: andstor/file-existence-action@20b4d2e596410855db8f9ca21e96fbe18e12930b # v2
with: with:
files: "${{ env.APP_NAME }}/composer.json" files: "${{ env.APP_NAME }}/composer.json"
@@ -91,16 +93,29 @@ jobs:
npm ci npm ci
npm run build npm run build
- name: Install Krankerl - name: Check Krankerl config
run: | id: krankerl
wget https://github.com/ChristophWurst/krankerl/releases/download/v0.13.0/krankerl_0.13.0_amd64.deb uses: andstor/file-existence-action@20b4d2e596410855db8f9ca21e96fbe18e12930b # v2
sudo dpkg -i krankerl_0.13.0_amd64.deb with:
files: ${{ env.APP_NAME }}/krankerl.toml
- name: Package ${{ env.APP_NAME }} ${{ env.APP_VERSION }} - name: Install Krankerl
# Try krankerl, fallback to makefile if: steps.krankerl.outputs.files_exists == 'true'
run: |
wget https://github.com/ChristophWurst/krankerl/releases/download/v0.14.0/krankerl_0.14.0_amd64.deb
sudo dpkg -i krankerl_0.14.0_amd64.deb
- name: Package ${{ env.APP_NAME }} ${{ env.APP_VERSION }} with krankerl
if: steps.krankerl.outputs.files_exists == 'true'
run: | run: |
cd ${{ env.APP_NAME }} cd ${{ env.APP_NAME }}
krankerl package || make appstore krankerl package
- name: Package ${{ env.APP_NAME }} ${{ env.APP_VERSION }} with makefile
if: steps.krankerl.outputs.files_exists != 'true'
run: |
cd ${{ env.APP_NAME }}
make appstore
- name: Checkout server ${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }} - name: Checkout server ${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }}
continue-on-error: true continue-on-error: true
@@ -111,7 +126,7 @@ jobs:
unzip latest-$NCVERSION.zip unzip latest-$NCVERSION.zip
- name: Checkout server master fallback - name: Checkout server master fallback
uses: actions/checkout@v3 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
if: ${{ steps.server-checkout.outcome != 'success' }} if: ${{ steps.server-checkout.outcome != 'success' }}
with: with:
repository: nextcloud/server repository: nextcloud/server
@@ -133,7 +148,7 @@ jobs:
tar -zcvf ${{ env.APP_NAME }}.tar.gz ${{ env.APP_NAME }} tar -zcvf ${{ env.APP_NAME }}.tar.gz ${{ env.APP_NAME }}
- name: Attach tarball to github release - name: Attach tarball to github release
uses: svenstaro/upload-release-action@v2 uses: svenstaro/upload-release-action@133984371c30d34e38222a64855679a414cb7575 # v2
id: attach_to_release id: attach_to_release
with: with:
repo_token: ${{ secrets.GITHUB_TOKEN }} repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -143,7 +158,7 @@ jobs:
overwrite: true overwrite: true
- name: Upload app to Nextcloud appstore - name: Upload app to Nextcloud appstore
uses: nextcloud-releases/nextcloud-appstore-push-action@v1 uses: nextcloud-releases/nextcloud-appstore-push-action@a011fe619bcf6e77ddebc96f9908e1af4071b9c1 # v1
with: with:
app_name: ${{ env.APP_NAME }} app_name: ${{ env.APP_NAME }}
appstore_token: ${{ secrets.APPSTORE_TOKEN }} appstore_token: ${{ secrets.APPSTORE_TOKEN }}

12
.github/workflows/command-rebase.yml vendored
View File

@@ -9,8 +9,8 @@ on:
issue_comment: issue_comment:
types: created types: created
permissions: permissions:
contents: read contents: read
jobs: jobs:
rebase: rebase:
@@ -23,7 +23,7 @@ jobs:
steps: steps:
- name: Add reaction on start - name: Add reaction on start
uses: peter-evans/create-or-update-comment@v2 uses: peter-evans/create-or-update-comment@5adcb0bb0f9fb3f95ef05400558bdb3f329ee808 # v2.1.0
with: with:
token: ${{ secrets.COMMAND_BOT_PAT }} token: ${{ secrets.COMMAND_BOT_PAT }}
repository: ${{ github.event.repository.full_name }} repository: ${{ github.event.repository.full_name }}
@@ -31,18 +31,18 @@ jobs:
reaction-type: "+1" reaction-type: "+1"
- name: Checkout the latest code - name: Checkout the latest code
uses: actions/checkout@v3 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
with: with:
fetch-depth: 0 fetch-depth: 0
token: ${{ secrets.COMMAND_BOT_PAT }} token: ${{ secrets.COMMAND_BOT_PAT }}
- name: Automatic Rebase - name: Automatic Rebase
uses: cirrus-actions/rebase@1.8 uses: cirrus-actions/rebase@6e572f08c244e2f04f9beb85a943eb618218714d # 1.7
env: env:
GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }} GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
- name: Add reaction on failure - name: Add reaction on failure
uses: peter-evans/create-or-update-comment@v2 uses: peter-evans/create-or-update-comment@5adcb0bb0f9fb3f95ef05400558bdb3f329ee808 # v2.1.0
if: failure() if: failure()
with: with:
token: ${{ secrets.COMMAND_BOT_PAT }} token: ${{ secrets.COMMAND_BOT_PAT }}

10
.github/workflows/dependabot-approve-merge.yml vendored
View File

@@ -15,22 +15,26 @@ on:
permissions: permissions:
contents: read contents: read
concurrency:
group: dependabot-approve-merge-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs: jobs:
auto-approve-merge: auto-approve-merge:
if: github.actor == 'dependabot[bot]' if: github.actor == 'dependabot[bot]'
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions: permissions:
# for hmarr/auto-approve-action to approve PRs # for hmarr/auto-approve-action to approve PRs
pull-requests: write pull-requests: write
steps: steps:
# Github actions bot approve # Github actions bot approve
- uses: hmarr/auto-approve-action@v3 - uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2
with: with:
github-token: ${{ secrets.GITHUB_TOKEN }} github-token: ${{ secrets.GITHUB_TOKEN }}
# Nextcloud bot approve and merge request # Nextcloud bot approve and merge request
- uses: ahmadnassri/action-dependabot-auto-merge@v2 - uses: ahmadnassri/action-dependabot-auto-merge@45fc124d949b19b6b8bf6645b6c9d55f4f9ac61a # v2
with: with:
target: minor target: minor
github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }} github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}

31
.github/workflows/fixup.yml vendored
View File

@@ -5,16 +5,29 @@
name: Pull request checks name: Pull request checks
on: pull_request on:
pull_request:
types: [opened, ready_for_review, reopened, synchronize]
permissions:
contents: read
concurrency:
group: fixup-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs: jobs:
commit-message-check: commit-message-check:
name: Block fixup and squash commits if: github.event.pull_request.draft == false
runs-on: ubuntu-latest permissions:
pull-requests: write
name: Block fixup and squash commits
steps: runs-on: ubuntu-latest
- name: Run check
uses: xt0rted/block-autosquash-commits-action@v2 steps:
with: - name: Run check
repo-token: ${{ secrets.GITHUB_TOKEN }} uses: xt0rted/block-autosquash-commits-action@79880c36b4811fe549cfffe20233df88876024e7 # v2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

12
.github/workflows/psalm.yml vendored
View File

@@ -13,6 +13,10 @@ on:
- main - main
- stable* - stable*
concurrency:
group: psalm-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs: jobs:
static-analysis: static-analysis:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -20,13 +24,15 @@ jobs:
name: Nextcloud name: Nextcloud
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
- name: Set up php - name: Set up php
uses: shivammathur/setup-php@2.23.0 uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2
with: with:
php-version: 7.4 php-version: 8.1
coverage: none coverage: none
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Install dependencies - name: Install dependencies
run: composer i run: composer i

19
.github/workflows/update-nextcloud-ocp.yml vendored
View File

@@ -17,22 +17,24 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
branches: ["main", "stable25", "stable24", "stable23"] branches: ["master", "stable25", "stable24"]
name: update-nextcloud-ocp-${{ matrix.branches }} name: update-nextcloud-ocp-${{ matrix.branches }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
with: with:
ref: ${{ matrix.branches }} ref: ${{ matrix.branches }}
submodules: true submodules: true
- name: Set up php7.4 - name: Set up php8.1
uses: shivammathur/setup-php@2.23.0 uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2
with: with:
php-version: 7.4 php-version: 8.1
extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
coverage: none coverage: none
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Composer install - name: Composer install
run: composer install run: composer install
@@ -45,14 +47,15 @@ jobs:
run: | run: |
git clean -f 3rdparty git clean -f 3rdparty
git clean -f vendor git clean -f vendor
git checkout 3rdparty vendor git clean -f vendor-bin
git checkout 3rdparty vendor vendor-bin
continue-on-error: true continue-on-error: true
- name: Create Pull Request - name: Create Pull Request
uses: peter-evans/create-pull-request@v4 uses: peter-evans/create-pull-request@18f7dc018cc2cd597073088f7c7591b9d1c02672 # v3
with: with:
token: ${{ secrets.COMMAND_BOT_PAT }} token: ${{ secrets.COMMAND_BOT_PAT }}
commit-message: Update psalm baseline commit-message: "chore(dev-deps): Bump nextcloud/ocp package"
committer: GitHub <noreply@github.com> committer: GitHub <noreply@github.com>
author: nextcloud-command <nextcloud-command@users.noreply.github.com> author: nextcloud-command <nextcloud-command@users.noreply.github.com>
signoff: true signoff: true

6
composer.json
View File

@@ -28,7 +28,7 @@
"composer/package-versions-deprecated": true "composer/package-versions-deprecated": true
}, },
"platform": { "platform": {
"php": "7.4" "php": "8.0"
} }
}, },
"scripts": { "scripts": {
@@ -42,8 +42,8 @@
"@test:unit", "@test:unit",
"@test:integration" "@test:integration"
], ],
"test:unit": "phpunit -c tests/phpunit.xml", "test:unit": "vendor/bin/phpunit -c tests/phpunit.xml",
"test:integration": "phpunit -c tests/phpunit.integration.xml && cd tests/integration && ./run.sh" "test:integration": "vendor/bin/phpunit -c tests/phpunit.integration.xml && cd tests/integration && ./run.sh"
}, },
"autoload-dev": { "autoload-dev": {
"psr-4": { "psr-4": {

4
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "2fc6f48159755a02b595b59f8c405d28", "content-hash": "22d201a4569de6d4fafbc13277ae91a6",
"packages": [ "packages": [
{ {
"name": "cogpowered/finediff", "name": "cogpowered/finediff",
@@ -5476,7 +5476,7 @@
"platform": [], "platform": [],
"platform-dev": [], "platform-dev": [],
"platform-overrides": { "platform-overrides": {
"php": "7.4" "php": "8.0"
}, },
"plugin-api-version": "2.3.0" "plugin-api-version": "2.3.0"
} }