From 9ab75cb7bd020fd98f274ba8394a8e12c662d05a Mon Sep 17 00:00:00 2001 From: Rosalie Wanders Date: Thu, 7 Nov 2024 21:32:24 +0100 Subject: [PATCH] ci: update actions and remove installation of OpenSSL --- .github/workflows/SporeMods.yml | 13 ++++--------- .github/workflows/SporeServer.yml | 12 ++++-------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/.github/workflows/SporeMods.yml b/.github/workflows/SporeMods.yml index b47e1d9..6d42a75 100644 --- a/.github/workflows/SporeMods.yml +++ b/.github/workflows/SporeMods.yml @@ -1,10 +1,6 @@ name: SporeMods -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] +on: [push, pull_request] jobs: build: @@ -12,13 +8,12 @@ jobs: runs-on: windows-2022 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: 'true' - - uses: microsoft/setup-msbuild@v1.1 + - uses: microsoft/setup-msbuild@v2 - name: Install Dependencies run: | - choco install openssl --forcex86 -r -y choco install 7zip -r -y - name: Build Spore-ModAPI run: | @@ -33,7 +28,7 @@ jobs: run: | cd SporeMods .\CreateSporeMod.bat - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: SporeServer.sporemod path: SporeMods/bin/SporeServer.sporemod diff --git a/.github/workflows/SporeServer.yml b/.github/workflows/SporeServer.yml index 5e4b8a2..6d723a2 100644 --- a/.github/workflows/SporeServer.yml +++ b/.github/workflows/SporeServer.yml @@ -1,10 +1,6 @@ name: SporeServer -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] +on: [push, pull_request] jobs: build: @@ -12,11 +8,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: Restore dependencies run: | dotnet restore /p:Configuration="Debug (.NET)"