Updated Action to not upload pull requests (#7)

* Trying to understand github object

Signed-off-by: Avior <florian.bouillon@delta-wings.net>

* Fixed Workflow

Signed-off-by: Avior <florian.bouillon@delta-wings.net>

* some more tests

Signed-off-by: Avior <florian.bouillon@delta-wings.net>
This commit is contained in:
Florian Bouillon 2021-04-23 16:49:28 +02:00 committed by GitHub
parent d5638674a2
commit 20ed7740a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 5 deletions

View File

@ -6,3 +6,7 @@ indent_size = 4
charset = utf-8 charset = utf-8
trim_trailing_whitespace = true trim_trailing_whitespace = true
insert_final_newline = true insert_final_newline = true
[*.yaml]
indent_size = 2
indent_style = space

View File

@ -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 # 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 # 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: on:
push: push:
branches:
- master
pull_request: pull_request:
repository_dispatch: repository_dispatch:
types: types:
@ -47,7 +49,7 @@ jobs:
- name: Commit Changes - name: Commit Changes
working-directory: ./dist 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: | run: |
git config --local user.email "bot@tcgdex.net" git config --local user.email "bot@tcgdex.net"
git config --local user.name "TCGdex [bot]" git config --local user.name "TCGdex [bot]"
@ -56,7 +58,7 @@ jobs:
- name: Push changes - name: Push changes
uses: ad-m/github-push-action@master 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: with:
github_token: ${{ secrets.PUSH_TOKEN }} github_token: ${{ secrets.PUSH_TOKEN }}
directory: ./dist directory: ./dist
@ -64,7 +66,7 @@ jobs:
- name: Upload - name: Upload
run: yarn 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: env:
UPLOAD_REMOTE: ${{ secrets.UPLOAD_REMOTE }} UPLOAD_REMOTE: ${{ secrets.UPLOAD_REMOTE }}
UPLOAD_DIST: ${{ secrets.UPLOAD_DIST }} UPLOAD_DIST: ${{ secrets.UPLOAD_DIST }}

2
dist

@ -1 +1 @@
Subproject commit 1e7d47d502f84849ac8aa9f9e689cc83252f6b95 Subproject commit 22246b5c913f785526df6d393e717a67c3d9c3f0