Skip to content

Commit

Permalink
Merge branch '1.6.x' into feature/undefined-expression-allowed
Browse files Browse the repository at this point in the history
  • Loading branch information
rajyan committed Apr 4, 2022
2 parents ef150c8 + 9484ae0 commit cd29f92
Show file tree
Hide file tree
Showing 9 changed files with 274 additions and 96 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ jobs:
tests-integration:
name: "Integration tests"
runs-on: ${{ matrix.operating-system }}
needs: tests
timeout-minutes: 60

strategy:
Expand Down Expand Up @@ -124,7 +123,6 @@ jobs:
tests-levels:
name: "Levels tests"
runs-on: ubuntu-latest
needs: tests
timeout-minutes: 60

steps:
Expand Down
43 changes: 19 additions & 24 deletions build-cs/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cd29f92

Please sign in to comment.