Build fewer symfiles (#826)

* Refactor build.yml

* Remove .travis.yml; speed up NONMATCHING build by not cleaning

* Force tools to build before syms, compare, modern

3 files changed, 84 insertions, 97 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2ea87994b..ae64c067d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,6 +8,13 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      GAME_VERSION: RUBY
+      GAME_REVISION: 0
+      GAME_LANGUAGE: ENGLISH
+      DEBUG: 0
+      MODERN: 0
+      COMPARE: 1
     steps:
       - name: Checkout
         uses: actions/checkout@master
@@ -43,31 +50,86 @@ jobs:
         working-directory: ./agbcc
 
       - name: Compare
-        run: |
-          make -j${nproc} compare_ruby
-          make -j${nproc} compare_ruby_rev1
-          make -j${nproc} compare_ruby_rev2
-          make -j${nproc} compare_sapphire
-          make -j${nproc} compare_sapphire_rev1
-          make -j${nproc} compare_sapphire_rev2
-          make -j${nproc} modern
+        run: make -j${nproc} all syms
+
+      - name: Compare rev1
+        env:
+          GAME_REVISION: 1
+        run: make -j${nproc} all syms
+
+      - name: Compare rev2
+        env:
+          GAME_REVISION: 2
+        run: make -j${nproc} all syms
+
+      - name: Compare Sapphire
+        env:
+          GAME_VERSION: SAPPHIRE
+        run: make -j${nproc} all syms
+
+      - name: Compare Sapphire rev1
+        env:
+          GAME_VERSION: SAPPHIRE
+          GAME_REVISION: 1
+        run: make -j${nproc} all syms
+
+      - name: Compare Sapphire rev2
+        env:
+          GAME_VERSION: SAPPHIRE
+          GAME_REVISION: 2
+        run: make -j${nproc} all syms
 
       - name: Nonmatching
-        run: |
-          make clean
-          make -j${nproc} ruby NONMATCHING=1
+        env:
+          NONMATCHING: 1
+          COMPARE: 0
+        run: make -j${nproc} $(git grep -wl NONMATCHING src | sed -r 's/^/-W /g')
 
-      - name: German
-        run: |
-          sh de_before.sh
-          make -j${nproc} compare_ruby_de
-          make -j${nproc} compare_ruby_de_debug
-          make -j${nproc} compare_ruby_de_rev1
-          make -j${nproc} compare_sapphire_de
-          make -j${nproc} compare_sapphire_de_debug
-          make -j${nproc} compare_sapphire_de_rev1
+      - name: Setup German
+        run: sh de_before.sh
         working-directory: ./build_de
 
+      - name: German Ruby
+        env:
+          GAME_LANGUAGE: GERMAN
+        run: make -j${nproc} all syms
+        working-directory: ./build_de
+
+      - name: German Ruby Debug
+        env:
+          GAME_LANGUAGE: GERMAN
+          DEBUG: 1
+        run: make -j${nproc} all syms
+        working-directory: ./build_de
+
+      - name: German Ruby rev1
+        env:
+          GAME_LANGUAGE: GERMAN
+          GAME_REVISION: 1
+        run: make -j${nproc} all syms
+        working-directory: ./build_de
+
+      - name: German Sapphire
+        env:
+          GAME_LANGUAGE: GERMAN
+          GAME_VERSION: SAPPHIRE
+        run: make -j${nproc} all syms
+        working-directory: ./build_de
+
+      - name: German Sapphire rev1
+        env:
+          GAME_LANGUAGE: GERMAN
+          GAME_VERSION: SAPPHIRE
+          GAME_REVISION: 1
+        run: make -j${nproc} all syms
+        working-directory: ./build_de
+
+      - name: Modern
+        env:
+          MODERN: 1
+          COMPARE: 0
+        run: make -j${nproc} all
+
       - name: Webhook
         if: ${{ github.event_name == 'push' }}
         env:
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 26d2e7f99..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-language: generic
-dist: bionic
-sudo: false
-env:
-  global:
-    - DEVKITPRO=$HOME
-    - DEVKITARM=$DEVKITPRO/devkitARM
-addons:
-  apt:
-    packages:
-      - gcc-multilib
-      - linux-libc-dev
-cache:
-  apt: true
-install:
-  - pushd $HOME
-  - travis_retry wget https://github.com/devkitPro/buildscripts/releases/download/devkitARM_r52/devkitARM_r52-linux.tar.xz
-  - tar xJf devkitARM*.tar.xz
-  - travis_retry wget https://github.com/devkitPro/devkitarm-rules/releases/download/v1.0.0/devkitarm-rules-1.0.0.tar.xz
-  - tar xJf devkitarm-rules-*.tar.xz -C $DEVKITARM
-  - travis_retry git clone https://github.com/pret/agbcc.git
-  - cd agbcc && ./build.sh && ./install.sh $TRAVIS_BUILD_DIR
-  - popd
-matrix:
-  include:
-    - os: linux
-      addons:
-        apt:
-          sources:
-              - ubuntu-toolchain-r-test
-          packages:
-            - g++-7
-      env: _="Build"
-      script:
-        - make tools CXX=g++-7
-        - make -j2 compare_ruby
-        - make -j2 compare_ruby_rev1
-        - make -j2 compare_ruby_rev2
-        - make -j2 compare_sapphire
-        - make -j2 compare_sapphire_rev1
-        - make -j2 compare_sapphire_rev2
-        - make -j2 modern
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-7
-      env: _="Build Nonmatching"
-      script:
-        - make tools CXX=g++-7
-        - make -j2 ruby NONMATCHING=1
-    - os: linux
-      addons:
-        apt:
-          sources:
-              - ubuntu-toolchain-r-test
-          packages:
-            - g++-7
-      env: _="Build German"
-      before_script:
-        - cp override-de.mk override.mk
-        - rsync -avhI data-de/ data/
-        - rsync -avhI graphics-de/ graphics/
-      script:
-        - make -j2 tools CXX=g++-7
-        - make -j2 compare_ruby_de
-        - make -j2 compare_sapphire_de
-        - make -j2 compare_ruby_de_debug
-        - make -j2 compare_sapphire_de_debug
-        - make -j2 compare_ruby_de_rev1
-        - make -j2 compare_sapphire_de_rev1
-after_success:
-  - .travis/calcrom/webhook.sh pokeruby
diff --git a/Makefile b/Makefile
index 66338cb67..cea619b95 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst
 
 # Build tools when building the rom
 # Disable dependency scanning for clean/tidy/tools
-ifeq (,$(filter-out all,$(MAKECMDGOALS)))
+ifeq (,$(filter-out all modern compare syms,$(MAKECMDGOALS)))
 $(call infoshell, $(MAKE) tools)
 else
 NODEP := 1
@@ -188,7 +188,7 @@ $(shell mkdir -p $(SUBDIRS))
 
 AUTO_GEN_TARGETS :=
 
-all: $(ROM) $(SYM)
+all: $(ROM)
 ifeq ($(COMPARE),1)
 	@$(SHA1SUM) $(BUILD_NAME).sha1
 endif