Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 7 additions & 14 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ MINIO_MC = "minio/mc:RELEASE.2020-12-18T10-53-53Z"
OC_CI_ALPINE = "owncloudci/alpine:latest"
OC_CI_BAZEL_BUILDIFIER = "owncloudci/bazel-buildifier"
OC_CI_CEPH = "owncloudci/ceph:tag-build-master-jewel-ubuntu-16.04"
OC_CI_CORE = "owncloudci/core"
OC_CI_CORE = "owncloudci/core:php83"
OC_CI_DRONE_SKIP_PIPELINE = "owncloudci/drone-skip-pipeline"
OC_CI_NODEJS = "owncloudci/nodejs:%s"
OC_CI_ORACLE_XE = "owncloudci/oracle-xe:latest"
Expand All @@ -21,7 +21,7 @@ SELENIUM_STANDALONE_CHROME_DEBUG = "selenium/standalone-chrome-debug:3.141.59-ox
SELENIUM_STANDALONE_FIREFOX_DEBUG = "selenium/standalone-firefox-debug:3.8.1"
SONARSOURCE_SONAR_SCANNER_CLI = "sonarsource/sonar-scanner-cli"

DEFAULT_PHP_VERSION = "7.4"
DEFAULT_PHP_VERSION = "8.3"
DEFAULT_NODEJS_VERSION = "14"

# minio mc environment variables
Expand Down Expand Up @@ -54,18 +54,11 @@ config = {
"master",
],
"appInstallCommandPhp": "composer install",
"codestyle": True,
"phan": {
"multipleVersions": {
"phpVersions": [
DEFAULT_PHP_VERSION,
"7.3",
],
},
},
"phpstan": True,
"codestyle": False,
"phan": False,
"phpstan": False,
"javascript": False,
"phpunit": True,
"phpunit": False,
"acceptance": {
"webUI": {
"suites": [
Expand Down Expand Up @@ -861,7 +854,7 @@ def acceptance(ctx):
errorFound = False

default = {
"servers": ["daily-master-qa", "latest"],
"servers": ["daily-master-qa"],
"browsers": ["chrome"],
"phpVersions": [DEFAULT_PHP_VERSION],
"databases": ["mariadb:10.2"],
Expand Down
68 changes: 68 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: CI

on:
push:
branches:
- master
pull_request:
types:
- opened
- synchronize
- reopened

permissions:
contents: read

concurrency:
group: ci-${{ github.ref }}
cancel-in-progress: true

env:
APP_NAME: files_texteditor
PHP_VERSIONS: '["8.3"]'

jobs:
get-vars:
runs-on: ubuntu-latest
outputs:
app-name: ${{ env.APP_NAME }}
php-versions: ${{ env.PHP_VERSIONS }}
steps:
- name: Set variables
run: |
echo "App name $APP_NAME"
echo "PHP versions string: $PHP_VERSIONS"

semantic-git-messages:
name: Commits
uses: owncloud/reusable-workflows/.github/workflows/semantic-git-message.yml@main

php-code-style:
name: PHP Code Style
needs:
- get-vars
uses: owncloud/reusable-workflows/.github/workflows/php-codestyle.yml@main
with:
app-name: ${{ needs.get-vars.outputs.app-name }}
php-versions: ${{ needs.get-vars.outputs.php-versions }}

php-unit:
name: PHP Unit
needs:
- get-vars
uses: owncloud/reusable-workflows/.github/workflows/php-unit.yml@main
with:
app-name: ${{ needs.get-vars.outputs.app-name }}
php-versions: ${{ needs.get-vars.outputs.php-versions }}

build:
name: Build
needs:
- php-code-style
- php-unit
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Build
run: make dist
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<repository type="git">https://github.com/owncloud/files_texteditor.git</repository>
<screenshot>https://raw.githubusercontent.com/owncloud/screenshots/a068ff44c439aa4969ea37b60e45bed875bbbb98/files_texteditor/texteditor.png</screenshot>
<dependencies>
<owncloud min-version="10.13" max-version="11" />
<php min-version="7.4" />
<owncloud min-version="11" max-version="11" />
<php min-version="8.3" />
</dependencies>
</info>
10 changes: 7 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,21 @@
"name": "owncloud/files_texteditor",
"config" : {
"platform": {
"php": "7.4"
"php": "8.3"
},
"allow-plugins": {
"bamarni/composer-bin-plugin": true
}
},
"replace": {
"firebase/php-jwt": "^6.8"
"firebase/php-jwt": "^7"
},
"require": {
"php": ">=8.3"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8"
"bamarni/composer-bin-plugin": "^1.8",
"roave/security-advisories": "dev-latest"
},
"extra": {
"bamarni-bin": {
Expand Down
Loading
Loading