From ccb123bc99ae548e6667057dd64925f1d65bbeab Mon Sep 17 00:00:00 2001
From: Sebastian Morr <sebastian@morr.cc>
Date: Thu, 15 Oct 2020 12:30:33 +0200
Subject: [PATCH] Clean up the CI file a bit

---
 .github/workflows/build.yml    | 40 ++++++++++++++++++++++++++++++++
 .github/workflows/godot-ci.yml | 42 ----------------------------------
 README.md                      |  4 ++--
 3 files changed, 42 insertions(+), 44 deletions(-)
 create mode 100644 .github/workflows/build.yml
 delete mode 100644 .github/workflows/godot-ci.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..de540a6
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,40 @@
+name: "Build"
+
+on:
+  push:
+    branches:
+      - main
+
+env:
+  PROJECT_NAME: ${{ github.event.repository.name }}
+  GODOT_VERSION: 3.2.3
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    container:
+      image: barichello/godot-ci:3.2.3
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup
+        run: |
+          mkdir -p ~/.local/share/godot/templates
+          mv /root/.local/share/godot/templates/$GODOT_VERSION.stable ~/.local/share/godot/templates/$GODOT_VERSION.stable
+      - name: Linux Build
+        run: |
+          mkdir -p build/$PROJECT_NAME-linux
+          godot --export "Linux" build/$PROJECT_NAME-linux/$PROJECT_NAME
+          cd build/$PROJECT_NAME-linux
+          zip -r ../$PROJECT_NAME-linux.zip .
+      - name: MacOS Build
+        run: |
+          godot --export "Mac OS" build/$PROJECT_NAME-macos.zip
+      - name: Install rsync
+        run: apt-get update && apt-get install -y rsync
+      - name: Deploy
+        uses: JamesIves/github-pages-deploy-action@3.6.2
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH: gh-pages
+          FOLDER: build
+          CLEAN: true
diff --git a/.github/workflows/godot-ci.yml b/.github/workflows/godot-ci.yml
deleted file mode 100644
index 762e97f..0000000
--- a/.github/workflows/godot-ci.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: "godot-ci export"
-on: push
-
-env:
-  GODOT_VERSION: 3.2.3
-  EXPORT_NAME: git-hydra
-
-jobs:
-  export:
-    name: Export
-    runs-on: ubuntu-latest
-    container:
-      image: barichello/godot-ci:3.2.3
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-      - name: Setup
-        run: |
-          mkdir -v -p ~/.local/share/godot/templates
-          mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable
-      - name: Linux Build
-        run: |
-          mkdir -v -p build/linux/$EXPORT_NAME
-          godot -v --export "Linux" build/linux/$EXPORT_NAME/$EXPORT_NAME.x86_64
-          cd build/linux
-          zip -r $EXPORT_NAME.zip $EXPORT_NAME
-          rm $EXPORT_NAME -rf
-      - name: Mac Build
-        run: |
-          mkdir -v -p build/mac
-          godot -v --export "Mac OS" build/mac/$EXPORT_NAME.zip
-      - name: Install rsync
-        run: |
-          apt-get update && apt-get install -y rsync
-      - name: Deploy
-        uses: JamesIves/github-pages-deploy-action@3.6.2
-        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: gh-pages
-          FOLDER: build
-          CLEAN: true 
-
diff --git a/README.md b/README.md
index c702c92..85e328d 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,8 @@ The current form is an early prototype, and will change significantly until the
 
 You can download binaries of the game here:
 
-- [Linux](https://git-learning-game.github.io/git-hydra/linux/git-hydra.zip)
-- [macOS](https://git-learning-game.github.io/git-hydra/mac/git-hydra.zip)
+- [Linux](https://git-learning-game.github.io/git-hydra/git-hydra-linux.zip)
+- [macOS](https://git-learning-game.github.io/git-hydra/git-hydra-macos.zip)
 
 We'll also have a Windows version soon – stay tuned! :)