Skip to content

Commit

Permalink
Merge branch 'main' into chore/multiline-e2e
Browse files Browse the repository at this point in the history
  • Loading branch information
theofidry authored Oct 14, 2023
2 parents 7b3a9f1 + 79889f2 commit 356a452
Show file tree
Hide file tree
Showing 9 changed files with 236 additions and 212 deletions.
15 changes: 8 additions & 7 deletions .github/workflows/composer-root-version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ on:
push:
branches: [ main ]
pull_request: ~

schedule:
# Do not make it the first of the month and/or midnight since it is a very busy time
- cron: "* 10 5 * *"
schedule:
# Do not make it the first of the month and/or midnight since it is a very busy time
- cron: "* 10 5 * *"

# See https://stackoverflow.com/a/72408109
concurrency:
Expand Down Expand Up @@ -57,7 +56,7 @@ jobs:
- name: Lint CS
run: cd composer-root-version-checker; make cs_lint

tests:
composer-root-version:
runs-on: ubuntu-latest
name: Tests
strategy:
Expand Down Expand Up @@ -87,9 +86,11 @@ jobs:
# the protected branch rules as opposed to the tests one above which
# may change regularly.
validate-tests:
name: Tests status
name: RootVersionChecker Status
runs-on: ubuntu-latest
needs: tests
needs:
- cs-lint
- composer-root-version
if: always()
steps:
- name: Successful run
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/e2e-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ on:
pull_request: ~
release:
types: [ created ]

schedule:
# Do not make it the first of the month and/or midnight since it is a very busy time
- cron: "* 10 5 * *"
schedule:
# Do not make it the first of the month and/or midnight since it is a very busy time
- cron: "* 10 5 * *"

# See https://stackoverflow.com/a/72408109
concurrency:
Expand Down Expand Up @@ -155,10 +154,12 @@ jobs:
# may change regularly.
# This allows us to mark only this job as required instead of each individual
# ever-changing E2E tests.
validate-e2e:
name: Check status
validate-tests:
name: End-to-End Tests Status
runs-on: ubuntu-latest
needs: e2e-tests
needs:
- build-test-phar
- e2e-tests
if: always()
steps:
- name: Successful run
Expand Down
29 changes: 25 additions & 4 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ on:
push:
branches: [ main ]
pull_request: ~

schedule:
# Do not make it the first of the month and/or midnight since it is a very busy time
- cron: "* 10 5 * *"
schedule:
# Do not make it the first of the month and/or midnight since it is a very busy time
- cron: "* 10 5 * *"

# See https://stackoverflow.com/a/72408109
concurrency:
Expand Down Expand Up @@ -79,3 +78,25 @@ jobs:
run: make phpstan_install

- run: make phpstan

# This is a "trick", a meta task which does not change, and we can use in
# the protected branch rules as opposed to the E2E tests one above which
# may change regularly.
# This allows us to mark only this job as required instead of each individual
# ever-changing E2E tests.
validate-tests:
name: Lint Status
runs-on: ubuntu-latest
needs:
- cs
- phpstan
if: always()
steps:
- name: Successful run
if: ${{ !(contains(needs.*.result, 'failure')) }}
run: exit 0

- name: Failing run
if: ${{ contains(needs.*.result, 'failure') }}
run: exit 1

7 changes: 3 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ on:
pull_request: ~
release:
types: [ created ]

schedule:
# Do not make it the first of the month and/or midnight since it is a very busy time
- cron: "* 10 5 * *"
schedule:
# Do not make it the first of the month and/or midnight since it is a very busy time
- cron: "* 10 5 * *"

# See https://stackoverflow.com/a/72408109
concurrency:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/security.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ on:
pull_request: ~
release:
types: [ created ]
schedule:
# Do not make it the first of the month and/or midnight since it is a very busy time
- cron: "* 10 5 * *"
schedule:
# Do not make it the first of the month and/or midnight since it is a very busy time
- cron: "* 10 5 * *"

# See https://stackoverflow.com/a/72408109
concurrency:
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ on:
branches: [ main ]
pull_request: ~
release:
types: [ created ] ~

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

# See https://stackoverflow.com/a/72408109
concurrency:
Expand Down Expand Up @@ -99,9 +98,12 @@ jobs:
# the protected branch rules as opposed to the tests one above which
# may change regularly.
validate-tests:
name: Unit tests status
name: Unit tests Status
runs-on: ubuntu-latest
needs: unit-tests
needs:
- root-version
- composer-json
- unit-tests
if: always()
steps:
- name: Successful run
Expand Down
Loading

0 comments on commit 356a452

Please sign in to comment.