From 1f388448f2cb32f9e4fbe577dfd4423b2cfb1e4c Mon Sep 17 00:00:00 2001 From: Chris Breuer Date: Sat, 20 Mar 2021 14:02:23 -0700 Subject: [PATCH] chore: adjust formatting of yml files --- .editorconfig | 3 + .github/workflows/run-tests.yml | 98 ++++++++++++++++----------------- 2 files changed, 52 insertions(+), 49 deletions(-) diff --git a/.editorconfig b/.editorconfig index cd8eb86..1e716a7 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,5 +11,8 @@ end_of_line = lf insert_final_newline = true trim_trailing_whitespace = true +[*.yml] +indent_size = 2 + [*.md] trim_trailing_whitespace = false diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index dfb6b63..79310e8 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -1,54 +1,54 @@ name: Run Tests on: - push: - pull_request: + push: + pull_request: jobs: - run-tests: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - php: [7.4, 8.0] - laravel: [7.*, 8.*] - dependency-version: [prefer-stable] -# dependency-version: [prefer-lowest, prefer-stable] - include: - - laravel: 8.* - testbench: 6.* - - laravel: 7.* - testbench: 5.* - - name: P ${{ matrix.php }} - L ${{ matrix.laravel }} - ${{ matrix.dependency-version }} - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: mbstring, intl, pdo, pdo_sqlite, sqlite, curl - - - name: Cache dependencies - uses: actions/cache@v1 - with: - path: ~/.composer/cache/files - key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} - - - name: Install dependencies - run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update - composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest - - - name: Execute tests - run: vendor/bin/pest - env: - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_DEFAULT_REGION: 'us-east-1' - AWS_MEDIACONVERT_ACCOUNT_URL: ${{ secrets.AWS_MEDIACONVERT_ACCOUNT_URL }} - AWS_IAM_ARN: ${{ secrets.AWS_IAM_ARN }} - AWS_QUEUE_ARN: ${{ secrets.AWS_QUEUE_ARN }} + run-tests: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + php: [7.4, 8.0] + laravel: [7.*, 8.*] + dependency-version: [prefer-stable] + # dependency-version: [prefer-lowest, prefer-stable] + include: + - laravel: 8.* + testbench: 6.* + - laravel: 7.* + testbench: 5.* + + name: P ${{ matrix.php }} - L ${{ matrix.laravel }} - ${{ matrix.dependency-version }} + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: mbstring, intl, pdo, pdo_sqlite, sqlite, curl + + - name: Cache dependencies + uses: actions/cache@v1 + with: + path: ~/.composer/cache/files + key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} + + - name: Install dependencies + run: | + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest + + - name: Execute tests + run: vendor/bin/pest + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + AWS_DEFAULT_REGION: 'us-east-1' + AWS_MEDIACONVERT_ACCOUNT_URL: ${{ secrets.AWS_MEDIACONVERT_ACCOUNT_URL }} + AWS_IAM_ARN: ${{ secrets.AWS_IAM_ARN }} + AWS_QUEUE_ARN: ${{ secrets.AWS_QUEUE_ARN }}