From 5e79ae60584ad5ffe4dd9b3db81c5e40356c1ff2 Mon Sep 17 00:00:00 2001
From: Avior <florian.bouillon@delta-wings.net>
Date: Tue, 20 Apr 2021 19:34:47 +0200
Subject: [PATCH] Fix Github Action Errors (#6)

---
 .github/workflows/node.js.yml | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
index 4d83dfa..46f98cf 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -5,7 +5,9 @@ name: Compile & Push
 
 on:
   push:
-    branches: [ master, Aviortheking-patch-1 ]
+    branches:
+      - master
+  pull_request:
   workflow_dispatch:
   repository_dispatch:
     types:
@@ -18,7 +20,19 @@ jobs:
     steps:
     - uses: actions/checkout@v2
       with:
-        submodules: true
+        persist-credentials: false
+
+    
+    - uses: actions/checkout@v2
+      with:
+        repository: tcgdex/cards-database
+        path: ./db
+        persist-credentials: false
+
+    - uses: actions/checkout@v2
+      with:
+        repository: tcgdex/distribution
+        path: ./dist
         persist-credentials: false
     
     - name: Setup NodeJS
@@ -26,13 +40,9 @@ jobs:
       with:
         node-version: '14.x'
 
-    - name: Pull Distribution
-      working-directory: ./dist
-      run: git pull --rebase
-
     - name: Compile Database
       working-directory: ./db
-      run: git pull --rebase && yarn && yarn compile
+      run: yarn && yarn compile
       
     - name: Build
       working-directory: ./
@@ -43,7 +53,8 @@ jobs:
       run: |
         git config --local user.email "bot@tcgdex.net"
         git config --local user.name "TCGdex [bot]"
-        git commit -m "Updated Database" -a
+        git add .
+        git commit -m "Updated Database"
 
     - name: Push changes
       uses: ad-m/github-push-action@master