diff --git a/.editorconfig b/.editorconfig index f8c5d3d..f8e363e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,3 +6,7 @@ indent_size = 4 charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true + +[*.yaml] +indent_size = 2 +indent_style = space diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 96a2edb..37a7170 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -1,10 +1,12 @@ # This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions -name: Compile & Push +name: Compile TCGdex on: push: + branches: + - master pull_request: repository_dispatch: types: @@ -47,7 +49,7 @@ jobs: - name: Commit Changes working-directory: ./dist - if: ${{ (github.event_name == 'push' && github.ref == 'refs/head/master') || github.event_name == 'repository_dispatch' }} + if: ${{ (github.event_name == 'push') || github.event_name == 'repository_dispatch' }} run: | git config --local user.email "bot@tcgdex.net" git config --local user.name "TCGdex [bot]" @@ -56,7 +58,7 @@ jobs: - name: Push changes uses: ad-m/github-push-action@master - if: ${{ (github.event_name == 'push' && github.ref == 'refs/head/master') || github.event_name == 'repository_dispatch' }} + if: ${{ (github.event_name == 'push') || github.event_name == 'repository_dispatch' }} with: github_token: ${{ secrets.PUSH_TOKEN }} directory: ./dist @@ -64,7 +66,7 @@ jobs: - name: Upload run: yarn upload - if: ${{ (github.event_name == 'push' && github.ref == 'refs/head/master') || github.event_name == 'repository_dispatch' }} + if: ${{ (github.event_name == 'push') || github.event_name == 'repository_dispatch' }} env: UPLOAD_REMOTE: ${{ secrets.UPLOAD_REMOTE }} UPLOAD_DIST: ${{ secrets.UPLOAD_DIST }} diff --git a/dist b/dist index 1e7d47d..22246b5 160000 --- a/dist +++ b/dist @@ -1 +1 @@ -Subproject commit 1e7d47d502f84849ac8aa9f9e689cc83252f6b95 +Subproject commit 22246b5c913f785526df6d393e717a67c3d9c3f0