Merge branch 'master' of https://github.com/rh-hideout/pokeemerald in…

…to pull-rhh
edvinbr · Aug 25, 2021 · 46c50cd · 46c50cd
2 parents 6e449d4 + a9e9837
commit 46c50cd
Show file tree

Hide file tree

Showing 412 changed files with 29,948 additions and 32,518 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: 
+    branches:
       - master
       - battle_engine
       - pokemon_expansion
@@ -17,19 +17,13 @@ jobs:
       GAME_REVISION: 0
       GAME_LANGUAGE: ENGLISH
       MODERN: 0
-      COMPARE: 1
+      COMPARE: 0
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Checkout syms
-        uses: actions/checkout@master
-        with:
-          path: symbols
-          ref: symbols
-
       - name: Checkout agbcc
-        uses: actions/checkout@master
+        uses: actions/checkout@v2
         with:
           path: agbcc
           repository: pret/agbcc
@@ -47,7 +41,10 @@ jobs:
         working-directory: agbcc
 
       - name: Agbcc
-        run: make -j${nproc} 
+        run: make -j${nproc} all
 
       - name: Modern
-        run: make -j${nproc} modern
+        env:
+          MODERN: 1
+          COMPARE: 0
+        run: make -j${nproc} all