From 1171a5fd2d6de8b4c5b9b1abaeb6003c81241460 Mon Sep 17 00:00:00 2001
From: F1F7Y <64418963+F1F7Y@users.noreply.github.com>
Date: Thu, 22 Jun 2023 23:10:57 +0200
Subject: [PATCH] Download launcher from release instead of rebuilding (#498)

---
 .github/workflows/build.yml | 56 ++++---------------------------------
 1 file changed, 6 insertions(+), 50 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b67e290..4acef44 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,53 +17,12 @@ env:
   NORTHSTAR_VERSION: ${{ github.ref_name }}
 
 jobs:
-  build-launcher:
-    runs-on: windows-2022
-    steps:
-      - name: Checkout launcher repository
-        uses: actions/checkout@v3
-        with:
-          repository: R2Northstar/NorthstarLauncher
-          ref: ${{ env.NORTHSTAR_VERSION }}
-          path: northstar-launcher
-      - name: Setup MSBuild
-        uses: microsoft/setup-msbuild@v1.1
-      - name: Setup resource file version
-        shell: bash
-        working-directory: northstar-launcher
-        run: |
-          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' NorthstarLauncher/resources.rc
-          FILEVERSION=$(echo ${{ env.NORTHSTAR_VERSION }} | tr '.' ',' | sed -E 's/-rc[0-9]+//' | tr -d '[:alpha:]')
-          sed -i "s/0,0,0,1/${FILEVERSION}/g" NorthstarDLL/ns_version.h
-      - name: Build Launcher
-        working-directory: northstar-launcher
-        run: |
-          msbuild /p:Configuration=Release R2Northstar.sln
-      - name: Upload launcher build as artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: northstar-launcher
-          path: |
-            northstar-launcher/x64/Release/Northstar.dll
-            northstar-launcher/x64/Release/wsock32.dll
-            northstar-launcher/x64/Release/NorthstarLauncher.exe
-            northstar-launcher/x64/Release/*.txt
-      - name: Upload debug build artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: launcher-debug-files
-          path: |
-            northstar-launcher/x64/Release/*.pdb
-
   build-northstar:
-    needs: build-launcher
     runs-on: ubuntu-20.04
     steps:
       - name: Download compiled launcher
-        uses: actions/download-artifact@v3
-        with:
-          name: northstar-launcher
-          path: northstar-launcher
+        run:
+          wget "https://github.com/R2Northstar/NorthstarLauncher/releases/download/${{ env.NORTHSTAR_VERSION }}/northstar-launcher.zip"
       - name: Download DiscordRPC plugin
         run:
           wget "https://github.com/R2Northstar/NorthstarDiscordRPC/releases/download/v4/northstar-discord-rpc.zip"
@@ -98,15 +57,12 @@ jobs:
           rm -d northstar/release
           mkdir -p northstar/R2Northstar/mods
           mkdir -p northstar/R2Northstar/plugins
-          mkdir -p northstar/bin/x64_retail
+          mkdir -p northstar/bin/x64_dedi
 
-          unzip northstar-discord-rpc.zip
-          mv -v DiscordRPC.dll northstar/R2Northstar/plugins
-
-          mv -v northstar-launcher/wsock32.dll northstar/bin/x64_retail
+          unzip northstar-discord-rpc.zip -d northstar/R2Northstar/plugins
+          
           unzip NorthstarStubs.zip -d northstar/bin/x64_dedi
-
-          mv -v northstar-launcher/* northstar
+          unzip northstar-launcher.zip -d northstar
           rsync -avr --exclude="Northstar.Coop" --exclude=".git*" northstar-mods/. northstar/R2Northstar/mods
       - name: Checkout Navmesh repository
         uses: actions/checkout@v3