From eadb888199a82b3783fcbddf05b26e4a0ba4208d Mon Sep 17 00:00:00 2001
From: "Mike A. Trethewey" <miketrethewey@gmail.com>
Date: Thu, 7 Jan 2021 23:54:22 -0800
Subject: [PATCH] Move Build Scripts again

---
 .github/workflows/ci.yml                 | 20 +++++++-------------
 build-dr.py => source/meta/build-dr.py   |  2 +-
 build-gui.py => source/meta/build-gui.py |  2 +-
 3 files changed, 9 insertions(+), 15 deletions(-)
 rename build-dr.py => source/meta/build-dr.py (91%)
 rename build-gui.py => source/meta/build-gui.py (93%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ceec85c5..86474d75 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,13 +2,7 @@
 name: Build
 
 # fire on
-on:
-  push:
-    branches:
-      - DoorDev
-  pull_request:
-    branches:
-      - DoorDev
+on: [ push, pull_request ]
 
 # stuff to do
 jobs:
@@ -57,11 +51,11 @@ jobs:
     # run build-gui.py
     - name: Build GUI
       run: |
-        python ./build-gui.py
+        python ./source/meta/build-gui.py
     # run build-dr.py
     - name: Build DungeonRandomizer
       run: |
-        python ./build-dr.py
+        python ./source/meta/build-dr.py
     # prepare binary artifacts for later step
     - name: Prepare Binary Artifacts
       env:
@@ -220,7 +214,7 @@ jobs:
         body: ${{ steps.release_notes.outputs.body }}
         draft: true
         prerelease: true
-      if: contains(github.ref, 'master') || contains(github.ref, 'stable') || contains(github.ref, 'dev') || contains(github.ref, 'DoorRelease')
+      if: contains(github.ref, 'master') || (contains(github.ref, 'stable') && !contains(github.ref, 'unstable')) || contains(github.ref, 'dev') || contains(github.ref, 'DoorRelease')
     # upload linux archive asset
     - name: Upload Linux Archive Asset
       id: upload-linux-asset
@@ -232,7 +226,7 @@ jobs:
         asset_path: ../deploy/linux/ALttPDoorRandomizer.tar.gz
         asset_name: ALttPDoorRandomizer-${{ steps.debug_info.outputs.github_tag }}-linux-bionic.tar.gz
         asset_content_type: application/gzip
-      if: contains(github.ref, 'master') || contains(github.ref, 'stable') || contains(github.ref, 'dev') || contains(github.ref, 'DoorRelease')
+      if: contains(github.ref, 'master') || (contains(github.ref, 'stable') && !contains(github.ref, 'unstable')) || contains(github.ref, 'dev') || contains(github.ref, 'DoorRelease')
     # upload macos archive asset
     - name: Upload MacOS Archive Asset
       id: upload-macos-asset
@@ -244,7 +238,7 @@ jobs:
         asset_path: ../deploy/macos/ALttPDoorRandomizer.tar.gz
         asset_name: ALttPDoorRandomizer-${{ steps.debug_info.outputs.github_tag }}-osx.tar.gz
         asset_content_type: application/gzip
-      if: contains(github.ref, 'master') || contains(github.ref, 'stable') || contains(github.ref, 'dev') || contains(github.ref, 'DoorRelease')
+      if: contains(github.ref, 'master') || (contains(github.ref, 'stable') && !contains(github.ref, 'unstable')) || contains(github.ref, 'dev') || contains(github.ref, 'DoorRelease')
     # upload windows archive asset
     - name: Upload Windows Archive Asset
       id: upload-windows-asset
@@ -256,4 +250,4 @@ jobs:
         asset_path: ../deploy/windows/ALttPDoorRandomizer.zip
         asset_name: ALttPDoorRandomizer-${{ steps.debug_info.outputs.github_tag }}-windows.zip
         asset_content_type: application/zip
-      if: contains(github.ref, 'master') || contains(github.ref, 'stable') || contains(github.ref, 'dev') || contains(github.ref, 'DoorRelease')
+      if: contains(github.ref, 'master') || (contains(github.ref, 'stable') && !contains(github.ref, 'unstable')) || contains(github.ref, 'dev') || contains(github.ref, 'DoorRelease')
diff --git a/build-dr.py b/source/meta/build-dr.py
similarity index 91%
rename from build-dr.py
rename to source/meta/build-dr.py
index 46f5b88a..6f26adb9 100644
--- a/build-dr.py
+++ b/source/meta/build-dr.py
@@ -4,7 +4,7 @@ import shutil
 import sys
 
 # Spec file
-SPEC_FILE = os.path.join("DungeonRandomizer.spec")
+SPEC_FILE = os.path.join(".", "source", "DungeonRandomizer.spec")
 
 # Destination is current dir
 DEST_DIRECTORY = '.'
diff --git a/build-gui.py b/source/meta/build-gui.py
similarity index 93%
rename from build-gui.py
rename to source/meta/build-gui.py
index 6cc69228..ae284261 100644
--- a/build-gui.py
+++ b/source/meta/build-gui.py
@@ -4,7 +4,7 @@ import shutil
 import sys
 
 # Spec file
-SPEC_FILE = os.path.join("Gui.spec")
+SPEC_FILE = os.path.join(".", "source", "Gui.spec")
 
 # Destination is current dir
 DEST_DIRECTORY = '.'