Merge branch 'master' into options-fd

6 files changed, 57 insertions, 45 deletions

diff --git a/.travis/calcrom/.gitignore b/.github/calcrom/.gitignore
index e4016dbe..e4016dbe 100644
--- a/.travis/calcrom/.gitignore
+++ b/.github/calcrom/.gitignore
diff --git a/.travis/calcrom/Makefile b/.github/calcrom/Makefile
index e3b6ff50..e3b6ff50 100644
--- a/.travis/calcrom/Makefile
+++ b/.github/calcrom/Makefile
diff --git a/.travis/calcrom/calcrom.cpp b/.github/calcrom/calcrom.cpp
index 2947f5e7..2947f5e7 100644
--- a/.travis/calcrom/calcrom.cpp
+++ b/.github/calcrom/calcrom.cpp
diff --git a/.travis/calcrom/webhook.sh b/.github/calcrom/webhook.sh
index 66f141b6..279f795d 100755..100644
--- a/.travis/calcrom/webhook.sh
+++ b/.github/calcrom/webhook.sh
@@ -1,18 +1,19 @@
 #!/bin/bash -ex
 
 # Only run this script if it's the master branch build.
-if [[ "$TRAVIS_BRANCH" != "master" || "$TRAVIS_PULL_REQUEST" != "false" ]]; then
+if [[ "$GITHUB_REF" != "refs/heads/master" || "$GITHUB_EVENT_NAME" != "push" ]]; then
   exit 0
 fi
 
 build_name=$1
+url=$2
 map_file=$(dirname "$0")/../../arm9/build/diamond.us/arm9.elf.xMAP
 if [ ! -f $map_file ]; then
   echo "$map_file does not exist!"
   exit 1
 fi
 
-make -C ${TRAVIS_BUILD_DIR}/.travis/calcrom
-output=$(${TRAVIS_BUILD_DIR}/.travis/calcrom/calcrom ${TRAVIS_BUILD_DIR} | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g')
-curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`$build_name progress:\\n$output\`\`\`\"}" -H "Content-Type: application/json" -X POST $CALCROM_DISCORD_WEBHOOK_URL
+make -C ${GITHUB_WORKSPACE}/.github/calcrom
+output=$(${GITHUB_WORKSPACE}/.github/calcrom/calcrom ${GITHUB_WORKSPACE} | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g')
+curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`$build_name progress:\\n$output\`\`\`\"}" -H "Content-Type: application/json" -X POST $url
 popd
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000..ba976726
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,52 @@
+name: build
+
+on: [push, pull_request]
+
+env:
+  LM_LICENSE_FILE: "$GITHUB_WORKSPACE/tools/mwccarm/license.dat"
+  CC: gcc-8
+  CXX: g++-8
+  CALCROM_DISCORD_WEBHOOK_AVATAR_URL: "https://i.imgur.com/38BQHdd.png"
+  CALCROM_DISCORD_WEBHOOK_USERNAME: OK
+  CALCROM_WEBHOOK_URL: ${{ secrets.WEBHOOKURL }}
+
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+
+    steps:
+      - name: Update and Install Software
+        run: |
+          sudo apt update
+          sudo apt -y upgrade
+          sudo apt -y install g++-8-multilib linux-libc-dev binutils-arm-none-eabi
+          sudo dpkg --add-architecture i386
+          wget -qO - https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add -
+          sudo add-apt-repository ppa:cybermax-dexter/sdl2-backport
+          sudo apt-add-repository "deb https://dl.winehq.org/wine-builds/ubuntu $(lsb_release -cs) main"
+          sudo apt install --install-recommends winehq-stable
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+      - name: Setup Repo
+        run: |
+          mkdir -p ~/download
+          cd ~/download
+          wget http://private.martmists.com/mwccarm.zip
+          wget http://private.martmists.com/nitro.tar.gz
+          unzip mwccarm.zip
+          mv mwccarm $GITHUB_WORKSPACE/tools
+          tar xzf nitro.tar.gz
+          mv tools/bin $GITHUB_WORKSPACE/tools
+          mv include/nitro/specfiles/ARM7-TS.lcf.template $GITHUB_WORKSPACE/arm7
+          mv include/nitro/specfiles/ARM9-TS.lcf.template $GITHUB_WORKSPACE/arm9
+        working-directory: ~
+      - name: Build Diamond
+        run: make diamond
+      - name: Build Pearl
+        run: make pearl        
+      - name: Webhook
+        run: |
+          sudo chmod 755 $GITHUB_WORKSPACE/.github/calcrom/webhook.sh
+          $GITHUB_WORKSPACE/.github/calcrom/webhook.sh pokediamond "$CALCROM_WEBHOOK_URL"
+        continue-on-error: true
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ac700082..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-dist: bionic
-os: linux
-language: c
-env:
-    global:
-        - LM_LICENSE_FILE="$TRAVIS_BUILD_DIR/tools/mwccarm/license.dat"
-        - CC=gcc-8
-        - CXX=g++-8
-addons:
-    apt:
-        packages:
-            - g++-8-multilib
-            - linux-libc-dev
-            - binutils-arm-none-eabi
-            - wine32
-            - wine-stable
-cache:
-    apt: true
-install:
-    # These files are only accessible from Travis CI IP Addresses to prevent piracy.
-    - mkdir -p $HOME/download
-    - pushd $HOME/download
-    - wget http://private.martmists.com/mwccarm.zip
-    - wget http://private.martmists.com/nitro.tar.gz
-    - unzip mwccarm.zip
-    - mv mwccarm $TRAVIS_BUILD_DIR/tools
-    - tar xzf nitro.tar.gz
-    - mv tools/bin $TRAVIS_BUILD_DIR/tools
-    - mv include/nitro/specfiles/ARM7-TS.lcf.template $TRAVIS_BUILD_DIR/arm7
-    - mv include/nitro/specfiles/ARM9-TS.lcf.template $TRAVIS_BUILD_DIR/arm9
-    - popd
-
-script:
-    - travis_retry make
-    - travis_retry make pearl
-
-notifications:
-  email: false
-
-after_success:
-    - .travis/calcrom/webhook.sh pokediamond