Fix can't manually run workflows on non-master branches

ClassiCube · May 13, 2024 · 491609c · 491609c
1 parent be88b30
commit 491609c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,5 +1,11 @@
 name: Build latest
-on: [push, workflow_dispatch]
+# trigger via either push to selected branches or on manual run
+on:
+  push:
+    branches:
+      - master
+      - ModernLighting
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.ref }}-latest
@@ -10,7 +16,6 @@ jobs:
 # ============== .NET 2.0 BUILD =============
 # ===========================================
   build-mono2:
-    if: github.ref_name == github.event.repository.default_branch
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -43,7 +48,6 @@ jobs:
 # ============== .NET 4.0 BUILD =============
 # ===========================================
   build-mono4:
-    if: github.ref_name == github.event.repository.default_branch
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -85,7 +89,6 @@ jobs:
 # ============== .NET 6.0 BUILD =============
 # ===========================================
   build-dotnet6:
-    if: github.ref_name == github.event.repository.default_branch
     runs-on: ubuntu-latest
 
     steps:
@@ -155,7 +158,6 @@ jobs:
 # ============== .NET 8.0 BUILD =============
 # ===========================================
   build-dotnet8:
-    if: github.ref_name == github.event.repository.default_branch
     runs-on: ubuntu-latest
 
     steps:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,7 +7,6 @@ concurrency:
 
 jobs:
   build:
-    if: github.ref_name == github.event.repository.default_branch
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/MCGalaxy/Server/Maintenance/Updater.cs b/MCGalaxy/Server/Maintenance/Updater.cs
@@ -84,6 +84,7 @@ public static class Updater
                                 "prev_MCGalaxy_.dll", "prev_MCGalaxy.exe", "prev_MCGalaxyCLI.exe");
                 } catch {
                 }
+                Logger.Log(LogType.SystemActivity, "Downloading update files");
 
                 WebClient client = HttpUtil.CreateWebClient();
                 client.DownloadFile(DLL_URL, "MCGalaxy_.update");