From ae74cde53348e15507b02c9c932e2b359da625b0 Mon Sep 17 00:00:00 2001 From: penev92 Date: Wed, 3 May 2023 21:53:08 +0300 Subject: [PATCH] Minor updates to get in line with other projects To get in line with other OpenRA-specific forks of third-party dependencies that we package as NuGets. --- .editorconfig | 1 - .github/workflows/build-natives.yml | 8 ++++---- .github/workflows/build-nuget.yml | 2 +- OpenRA-SDL2-CS.nuspec | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.editorconfig b/.editorconfig index 5d0dbdec..82fbe155 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,7 +8,6 @@ end_of_line = LF insert_final_newline = true trim_trailing_whitespace = true -; 4-column tab indentation [*.yml] indent_style = space indent_size = 4 diff --git a/.github/workflows/build-natives.yml b/.github/workflows/build-natives.yml index bc5d8ed8..a42794ea 100644 --- a/.github/workflows/build-natives.yml +++ b/.github/workflows/build-natives.yml @@ -1,9 +1,9 @@ -name: Build native dependencies +name: Build native dependencies (SDL2) # Change SDL2 version based on https://github.com/libsdl-org/SDL/releases, but remember to check what SDL2 version SDL2-CS targets. # Change Chromium revision numbers based on https://chromium.woolyss.com/download/. env: - SDL2_VERSION: 2.0.22 + SDL2_VERSION: 2.0.22 # Make sure this matches the version mentioned in the description in the .nuspec file. CHROMIUM_BUILD_x86: 1136315 CHROMIUM_BUILD_x64: 1136314 @@ -73,8 +73,8 @@ jobs: name: Natives-MacOS path: ./artifacts - # Note: Running inside a CentOS container because we want to compile using a version of glibc that is as old as reasonably possible - # to ensure backwards compatibility of the compiled binaries. + # Note: Running inside a RockyLinux container because we want to compile using a version of glibc + # that is as old as reasonably possible to ensure backwards compatibility of the compiled binaries. linux-x64: name: Linux (x64) runs-on: ubuntu-22.04 diff --git a/.github/workflows/build-nuget.yml b/.github/workflows/build-nuget.yml index fc95635c..145b06af 100644 --- a/.github/workflows/build-nuget.yml +++ b/.github/workflows/build-nuget.yml @@ -85,7 +85,7 @@ jobs: - name: Upload NuGet package to Artifacts uses: actions/upload-artifact@v3 with: - name: NuGet Package v.${{ github.event.inputs.nugetPackageVersion }} + name: NuGet Package ${{ github.event.inputs.nugetPackageVersion }} path: ./nuget - name: Tag a release diff --git a/OpenRA-SDL2-CS.nuspec b/OpenRA-SDL2-CS.nuspec index f6d15803..55cef144 100644 --- a/OpenRA-SDL2-CS.nuspec +++ b/OpenRA-SDL2-CS.nuspec @@ -16,7 +16,7 @@ - Copyright (c) the SDL developers and contributors Zlib - OpenRA + OpenRA natives SDL