From 0872002dae186c327d78377c9b5095ea7b79a26a Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Wed, 4 Jan 2023 19:01:21 +0100 Subject: [PATCH] Attempt to restore Linux build with dotnet7 --- .github/workflows/build_linux.yml | 16 ++++++++++++++-- .github/workflows/build_windows.yml | 7 +++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index e04e10a5c..6bc6ac515 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -5,7 +5,6 @@ jobs: # Editor editor-linux: - if: ${{ false }} name: Editor (Linux, Development x64) runs-on: "ubuntu-20.04" steps: @@ -19,6 +18,13 @@ jobs: sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev - name: Setup Vulkan uses: ./.github/actions/vulkan + - name: Setup .NET + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 7.0.x + - name: Print .NET info + run: | + dotnet --info - name: Checkout LFS run: | git lfs version @@ -29,7 +35,6 @@ jobs: # Game game-linux: - if: ${{ false }} name: Game (Linux, Release x64) runs-on: "ubuntu-20.04" steps: @@ -40,6 +45,13 @@ jobs: sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev - name: Setup Vulkan uses: ./.github/actions/vulkan + - name: Setup .NET + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 7.0.x + - name: Print .NET info + run: | + dotnet --info - name: Checkout LFS run: | git lfs version diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index d107f074a..a8add96f4 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -16,9 +16,9 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: 7.0.x - - name: Check .NET versions + - name: Print .NET info run: | - dotnet --list-sdks + dotnet --info - name: Checkout LFS run: | git lfs version @@ -40,6 +40,9 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: 7.0.x + - name: Print .NET info + run: | + dotnet --info - name: Checkout LFS run: | git lfs version