Merge pull request #44 from ValidHunters/Retvrn

Revert to using github runners
ValidHunters · May 26, 2024 · 7fe010f · 7fe010f
2 parents dc1408e + 2c6d8e1
commit 7fe010f
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 56 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -8,17 +8,21 @@ on:
 
 jobs:
   build:
-    runs-on: Mirai
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 8.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Build
         run: dotnet build --configuration Release --no-restore
       - name: SS14.Launcher.Tests
         run: dotnet test SS14.Launcher.Tests/SS14.Launcher.Tests.csproj -v n
       - name: Test Hidesey
-        run: dotnet test Marsey.Tests/Marsey.Tests.csproj -v n
+        run: dotnet test Marsey.Tests/Marsey.Tests.csproj -v n
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -3,61 +3,64 @@ name: Publish Release
 on:
   push:
     tags:
-    - 'v*'
+      - 'v*'
 
 jobs:
   build:
-    runs-on: Mirai
-    
+    runs-on: ubuntu-latest
+
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-      with:
-        submodules: 'recursive'
-
-    - name: Create build
-      run: ./publish.sh
-
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: mrsy-${{ github.sha }}
-        release_name: Release ${{ github.ref }}
-        draft: false
-        prerelease: false
-
-    # Upload Linux
-    - name: Upload Release Asset
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./SS14.Launcher_Linux.zip
-        asset_name: SS14.Launcher_Linux.zip
-        asset_content_type: application/zip
-
-    # Upload Windows
-    - name: Upload Release Asset
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./SS14.Launcher_Windows.zip
-        asset_name: SS14.Launcher_Windows.zip
-        asset_content_type: application/zip
-
-    # Upload macOS
-    - name: Upload Release Asset
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./SS14.Launcher_macOS.zip
-        asset_name: SS14.Launcher_macOS.zip
-        asset_content_type: application/zip
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+
+      - name: Create build
+        run: ./publish.sh
+
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref_name }}
+          release_name: Release ${{ github.ref_name }}
+          draft: false
+          prerelease: false
+
+      # Upload Linux
+      - name: Upload Release Asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./SS14.Launcher_Linux.zip
+          asset_name: SS14.Launcher_Linux.zip
+          asset_content_type: application/zip
+
+      # Upload Windows
+      - name: Upload Release Asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./SS14.Launcher_Windows.zip
+          asset_name: SS14.Launcher_Windows.zip
+          asset_content_type: application/zip
+
+      # Upload macOS
+      - name: Upload Release Asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./SS14.Launcher_macOS.zip
+          asset_name: SS14.Launcher_macOS.zip
+          asset_content_type: application/zip