From ceb021dbdf08a1c56e330e761a0d3c39974e4afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Domeradzki?= Date: Mon, 4 Apr 2022 22:06:03 +0200 Subject: [PATCH] Use `windows-latest` runner again (#2547) * Attempt at resolving https://github.com/actions/virtual-environments/issues/5189 * Clean up dockerfiles from no longer required workarounds --- .github/crowdin.yml | 10 ++++-- .github/workflows/publish.yml | 34 +++++++++---------- ...ngs.zh-CN.resx => Strings.zh-Hans-CN.resx} | 0 ...ngs.zh-HK.resx => Strings.zh-Hant-HK.resx} | 0 ...ngs.zh-TW.resx => Strings.zh-Hant-TW.resx} | 0 ...ngs.zh-CN.resx => Strings.zh-Hans-CN.resx} | 0 ...ngs.zh-HK.resx => Strings.zh-Hant-HK.resx} | 0 ...ngs.zh-TW.resx => Strings.zh-Hant-TW.resx} | 0 Dockerfile | 3 -- Dockerfile.Service | 3 -- 10 files changed, 25 insertions(+), 25 deletions(-) rename ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/{Strings.zh-CN.resx => Strings.zh-Hans-CN.resx} (100%) rename ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/{Strings.zh-HK.resx => Strings.zh-Hant-HK.resx} (100%) rename ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/{Strings.zh-TW.resx => Strings.zh-Hant-TW.resx} (100%) rename ArchiSteamFarm/Localization/{Strings.zh-CN.resx => Strings.zh-Hans-CN.resx} (100%) rename ArchiSteamFarm/Localization/{Strings.zh-HK.resx => Strings.zh-Hant-HK.resx} (100%) rename ArchiSteamFarm/Localization/{Strings.zh-TW.resx => Strings.zh-Hant-TW.resx} (100%) diff --git a/.github/crowdin.yml b/.github/crowdin.yml index abb14dd25..ec47ed277 100644 --- a/.github/crowdin.yml +++ b/.github/crowdin.yml @@ -6,7 +6,10 @@ "translation": "/ArchiSteamFarm/Localization/Strings.%locale%.resx", "translation_replace": { ".lol-US.resx": ".qps-Ploc.resx", - ".sr-CS.resx": ".sr-Latn.resx" + ".sr-CS.resx": ".sr-Latn.resx", + ".zh-CN.resx": ".zh-Hans-CN.resx", + ".zh-HK.resx": ".zh-Hant-HK.resx", + ".zh-TW.resx": ".zh-Hant-TW.resx" } }, { @@ -14,7 +17,10 @@ "translation": "/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.%locale%.resx", "translation_replace": { ".lol-US.resx": ".qps-Ploc.resx", - ".sr-CS.resx": ".sr-Latn.resx" + ".sr-CS.resx": ".sr-Latn.resx", + ".zh-CN.resx": ".zh-Hans-CN.resx", + ".zh-HK.resx": ".zh-Hant-HK.resx", + ".zh-TW.resx": ".zh-Hant-TW.resx" } }, { diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 2955122a6..4b3542b5e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, ubuntu-latest, windows-2019] + os: [macos-latest, ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} @@ -407,52 +407,52 @@ jobs: # TODO: It'd be perfect if we could match final artifacts to the platform they target, so e.g. linux build comes from the linux machine # However, that is currently impossible due to https://github.com/dotnet/msbuild/issues/3897 # Therefore, we'll (sadly) pull artifacts from Windows machine only for now - - name: Download ASF-generic artifact from windows-2019 + - name: Download ASF-generic artifact from windows-latest uses: actions/download-artifact@v3.0.0 with: - name: windows-2019_ASF-generic + name: windows-latest_ASF-generic path: out - - name: Download ASF-generic-netf artifact from windows-2019 + - name: Download ASF-generic-netf artifact from windows-latest uses: actions/download-artifact@v3.0.0 with: - name: windows-2019_ASF-generic-netf + name: windows-latest_ASF-generic-netf path: out - - name: Download ASF-linux-arm artifact from windows-2019 + - name: Download ASF-linux-arm artifact from windows-latest uses: actions/download-artifact@v3.0.0 with: - name: windows-2019_ASF-linux-arm + name: windows-latest_ASF-linux-arm path: out - - name: Download ASF-linux-arm64 artifact from windows-2019 + - name: Download ASF-linux-arm64 artifact from windows-latest uses: actions/download-artifact@v3.0.0 with: - name: windows-2019_ASF-linux-arm64 + name: windows-latest_ASF-linux-arm64 path: out - - name: Download ASF-linux-x64 artifact from windows-2019 + - name: Download ASF-linux-x64 artifact from windows-latest uses: actions/download-artifact@v3.0.0 with: - name: windows-2019_ASF-linux-x64 + name: windows-latest_ASF-linux-x64 path: out - - name: Download ASF-osx-arm64 artifact from windows-2019 + - name: Download ASF-osx-arm64 artifact from windows-latest uses: actions/download-artifact@v3.0.0 with: - name: windows-2019_ASF-osx-arm64 + name: windows-latest_ASF-osx-arm64 path: out - - name: Download ASF-osx-x64 artifact from windows-2019 + - name: Download ASF-osx-x64 artifact from windows-latest uses: actions/download-artifact@v3.0.0 with: - name: windows-2019_ASF-osx-x64 + name: windows-latest_ASF-osx-x64 path: out - - name: Download ASF-win-x64 artifact from windows-2019 + - name: Download ASF-win-x64 artifact from windows-latest uses: actions/download-artifact@v3.0.0 with: - name: windows-2019_ASF-win-x64 + name: windows-latest_ASF-win-x64 path: out - name: Import GPG key for signing diff --git a/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.zh-CN.resx b/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.zh-Hans-CN.resx similarity index 100% rename from ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.zh-CN.resx rename to ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.zh-Hans-CN.resx diff --git a/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.zh-HK.resx b/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.zh-Hant-HK.resx similarity index 100% rename from ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.zh-HK.resx rename to ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.zh-Hant-HK.resx diff --git a/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.zh-TW.resx b/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.zh-Hant-TW.resx similarity index 100% rename from ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.zh-TW.resx rename to ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.zh-Hant-TW.resx diff --git a/ArchiSteamFarm/Localization/Strings.zh-CN.resx b/ArchiSteamFarm/Localization/Strings.zh-Hans-CN.resx similarity index 100% rename from ArchiSteamFarm/Localization/Strings.zh-CN.resx rename to ArchiSteamFarm/Localization/Strings.zh-Hans-CN.resx diff --git a/ArchiSteamFarm/Localization/Strings.zh-HK.resx b/ArchiSteamFarm/Localization/Strings.zh-Hant-HK.resx similarity index 100% rename from ArchiSteamFarm/Localization/Strings.zh-HK.resx rename to ArchiSteamFarm/Localization/Strings.zh-Hant-HK.resx diff --git a/ArchiSteamFarm/Localization/Strings.zh-TW.resx b/ArchiSteamFarm/Localization/Strings.zh-Hant-TW.resx similarity index 100% rename from ArchiSteamFarm/Localization/Strings.zh-TW.resx rename to ArchiSteamFarm/Localization/Strings.zh-Hant-TW.resx diff --git a/Dockerfile b/Dockerfile index f7677db74..12e7c0c01 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,9 +37,6 @@ RUN dotnet --info && \ "arm64") asf_variant="${TARGETOS}-${TARGETARCH}" ;; \ *) echo "ERROR: Unsupported CPU architecture: ${TARGETARCH}"; exit 1 ;; \ esac && \ - # TODO: Remove workaround for https://github.com/microsoft/msbuild/issues/3897 when it's no longer needed - if [ -f "ArchiSteamFarm/Localization/Strings.zh-CN.resx" ]; then ln -s "Strings.zh-CN.resx" "ArchiSteamFarm/Localization/Strings.zh-Hans.resx"; fi && \ - if [ -f "ArchiSteamFarm/Localization/Strings.zh-TW.resx" ]; then ln -s "Strings.zh-TW.resx" "ArchiSteamFarm/Localization/Strings.zh-Hant.resx"; fi && \ if [ -n "${STEAM_TOKEN_DUMPER_TOKEN-}" ] && [ -f "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs" ]; then sed -i "s/STEAM_TOKEN_DUMPER_TOKEN/${STEAM_TOKEN_DUMPER_TOKEN}/g" "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs"; dotnet publish "${STEAM_TOKEN_DUMPER_NAME}" -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}" -p:ASFVariant=docker -p:ContinuousIntegrationBuild=true -p:UseAppHost=false -r "$asf_variant" --nologo --no-self-contained; fi && \ dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/result" -p:ASFVariant=docker -p:ContinuousIntegrationBuild=true -p:UseAppHost=false -r "$asf_variant" --nologo --no-self-contained && \ if [ -d "ArchiSteamFarm/overlay/generic" ]; then cp -pR "ArchiSteamFarm/overlay/generic/"* "out/result"; fi && \ diff --git a/Dockerfile.Service b/Dockerfile.Service index 716e06f26..e62b47459 100644 --- a/Dockerfile.Service +++ b/Dockerfile.Service @@ -37,9 +37,6 @@ RUN dotnet --info && \ "arm64") asf_variant="${TARGETOS}-${TARGETARCH}" ;; \ *) echo "ERROR: Unsupported CPU architecture: ${TARGETARCH}"; exit 1 ;; \ esac && \ - # TODO: Remove workaround for https://github.com/microsoft/msbuild/issues/3897 when it's no longer needed - if [ -f "ArchiSteamFarm/Localization/Strings.zh-CN.resx" ]; then ln -s "Strings.zh-CN.resx" "ArchiSteamFarm/Localization/Strings.zh-Hans.resx"; fi && \ - if [ -f "ArchiSteamFarm/Localization/Strings.zh-TW.resx" ]; then ln -s "Strings.zh-TW.resx" "ArchiSteamFarm/Localization/Strings.zh-Hant.resx"; fi && \ if [ -n "${STEAM_TOKEN_DUMPER_TOKEN-}" ] && [ -f "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs" ]; then sed -i "s/STEAM_TOKEN_DUMPER_TOKEN/${STEAM_TOKEN_DUMPER_TOKEN}/g" "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs"; dotnet publish "${STEAM_TOKEN_DUMPER_NAME}" -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}" -p:ASFVariant=docker -p:ContinuousIntegrationBuild=true -p:UseAppHost=false -r "$asf_variant" --nologo --no-self-contained; fi && \ dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/result" "-p:ASFVariant=${asf_variant}" -p:ContinuousIntegrationBuild=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r "$asf_variant" --nologo --self-contained && \ if [ -d "ArchiSteamFarm/overlay/${TARGETOS}" ]; then cp -pR "ArchiSteamFarm/overlay/${TARGETOS}/"* "out/result"; fi && \