From 577f517bb28ed18e50f6a9bd0aa2ad78aa8ba516 Mon Sep 17 00:00:00 2001 From: John Learn Date: Wed, 25 Sep 2024 12:40:01 -0400 Subject: [PATCH] ci fixes --- .github/workflows/ci.yml | 10 ++++++---- .github/workflows/t.yml | 2 ++ public/assets/.gitkeep | 0 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 public/assets/.gitkeep diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b743bdf..0927f16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,8 +1,7 @@ name: "Continuous Integration" on: - - pull_request - - push + push: jobs: @@ -12,19 +11,22 @@ jobs: matrix: include: - operating-system: 'ubuntu-latest' + silverstripe-version: '5.0' php-version: '8.1' - operating-system: 'ubuntu-latest' + silverstripe-version: '4.0' php-version: '8.0' - operating-system: 'ubuntu-latest' + silverstripe-version: '4.0' php-version: '7.4' - name: PHP ${{ matrix.php-version }} + name: SS ${{ matrix.silverstripe-version }}, PHP ${{ matrix.php-version }} runs-on: ${{ matrix.operating-system }} steps: - uses: actions/checkout@v3 - uses: php-actions/composer@v6 with: - args: silverstripe/framework:^5.0 + command: update --with silverstripe/framework:^${{ matrix.silverstripe-version }} php_version: ${{ matrix.php-version }} php_extensions: intl - run: | diff --git a/.github/workflows/t.yml b/.github/workflows/t.yml index eb31e9a..87fa1a2 100644 --- a/.github/workflows/t.yml +++ b/.github/workflows/t.yml @@ -15,6 +15,8 @@ jobs: - uses: actions/checkout@v3 - uses: php-actions/composer@v6 with: + command: update --with silverstripe/framework:^5.0 + php_version: 8.1 php_extensions: xdebug intl - name: Generate Code Coverage run: | diff --git a/public/assets/.gitkeep b/public/assets/.gitkeep new file mode 100644 index 0000000..e69de29