Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into chore/phpunit
Browse files Browse the repository at this point in the history
  • Loading branch information
theofidry committed Nov 28, 2023
2 parents c46274c + d6a3173 commit eea7c79
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 11 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
name: "coding standards"

on: ["pull_request", "push"]
on:
pull_request: ~
push: ~
schedule:
# Do not make it the first of the month and/or midnight since it is a very busy time
- cron: "* 10 5 * *"

jobs:
coding-standards:
name: "coding standards"
runs-on: "ubuntu-latest"
steps:
- name: "checkout"
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"

- name: "build the environment"
run: "dev/bin/docker-compose build"
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
name: "static analysis"

on: ["pull_request", "push"]
on:
pull_request: ~
push: ~
schedule:
# Do not make it the first of the month and/or midnight since it is a very busy time
- cron: "* 10 5 * *"

jobs:
static-analysis:
name: "static analysis"
runs-on: "ubuntu-latest"
steps:
- name: "checkout"
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"

- name: "build the environment"
run: "dev/bin/docker-compose build"
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
name: "unit tests"

on: [ "pull_request", "push" ]
on:
pull_request: ~
push: ~
schedule:
# Do not make it the first of the month and/or midnight since it is a very busy time
- cron: "* 10 5 * *"

jobs:
tests:
Expand Down Expand Up @@ -36,7 +41,7 @@ jobs:

steps:
- name: "checkout"
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"

- name: "build the PHP8 environment"
run: "dev/bin/docker-compose build --build-arg PHP_VERSION=${{ matrix.php }} --build-arg XDEBUG_VERSION='3.2.0' php"
Expand Down
5 changes: 1 addition & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@
"psr-4": { "League\\Bundle\\OAuth2ServerBundle\\Tests\\": "tests/" }
},
"config": {
"sort-packages": true,
"allow-plugins": {
"bamarni/composer-bin-plugin": true
}
"sort-packages": true
},
"extra": {
"branch-alias": {
Expand Down
2 changes: 1 addition & 1 deletion dev/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG PHP_VERSION=7.4
ARG PHP_VERSION=8.1

FROM php:${PHP_VERSION}-cli-alpine
LABEL maintainer="Petar Obradović <[email protected]>"
Expand Down

0 comments on commit eea7c79

Please sign in to comment.