Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-01 06:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use windows-latest runner again (#2547)

Browse Source 
* Attempt at resolving https://github.com/actions/virtual-environments/issues/5189

* Clean up dockerfiles from no longer required workarounds
This commit is contained in:
Łukasz Domeradzki
2022-04-04 22:06:03 +02:00
committed by GitHub
parent ce1c77780d
commit ceb021dbdf
10 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.github/crowdin.yml vendored
View File

@@ -6,7 +6,10 @@
"translation": "/ArchiSteamFarm/Localization/Strings.%locale%.resx", "translation": "/ArchiSteamFarm/Localization/Strings.%locale%.resx",
"translation_replace": { "translation_replace": {
".lol-US.resx": ".qps-Ploc.resx", ".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": "/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.%locale%.resx",
"translation_replace": { "translation_replace": {
".lol-US.resx": ".qps-Ploc.resx", ".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"
} }
}, },
{ {

34
.github/workflows/publish.yml vendored
View File

@@ -19,7 +19,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [macos-latest, ubuntu-latest, windows-2019] os: [macos-latest, ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }} 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 # 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 # 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 # 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 uses: actions/download-artifact@v3.0.0
with: with:
name: windows-2019_ASF-generic name: windows-latest_ASF-generic
path: out 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 uses: actions/download-artifact@v3.0.0
with: with:
name: windows-2019_ASF-generic-netf name: windows-latest_ASF-generic-netf
path: out 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 uses: actions/download-artifact@v3.0.0
with: with:
name: windows-2019_ASF-linux-arm name: windows-latest_ASF-linux-arm
path: out 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 uses: actions/download-artifact@v3.0.0
with: with:
name: windows-2019_ASF-linux-arm64 name: windows-latest_ASF-linux-arm64
path: out 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 uses: actions/download-artifact@v3.0.0
with: with:
name: windows-2019_ASF-linux-x64 name: windows-latest_ASF-linux-x64
path: out 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 uses: actions/download-artifact@v3.0.0
with: with:
name: windows-2019_ASF-osx-arm64 name: windows-latest_ASF-osx-arm64
path: out 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 uses: actions/download-artifact@v3.0.0
with: with:
name: windows-2019_ASF-osx-x64 name: windows-latest_ASF-osx-x64
path: out 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 uses: actions/download-artifact@v3.0.0
with: with:
name: windows-2019_ASF-win-x64 name: windows-latest_ASF-win-x64
path: out path: out
- name: Import GPG key for signing - name: Import GPG key for signing

0
ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.zh-CN.resx → ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.zh-Hans-CN.resx
View File

0
ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.zh-HK.resx → ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.zh-Hant-HK.resx
View File

0
ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.zh-TW.resx → ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.zh-Hant-TW.resx
View File

0
ArchiSteamFarm/Localization/Strings.zh-CN.resx → ArchiSteamFarm/Localization/Strings.zh-Hans-CN.resx
View File

0
ArchiSteamFarm/Localization/Strings.zh-HK.resx → ArchiSteamFarm/Localization/Strings.zh-Hant-HK.resx
View File

0
ArchiSteamFarm/Localization/Strings.zh-TW.resx → ArchiSteamFarm/Localization/Strings.zh-Hant-TW.resx
View File

3
Dockerfile
View File

@@ -37,9 +37,6 @@ RUN dotnet --info && \
"arm64") asf_variant="${TARGETOS}-${TARGETARCH}" ;; \ "arm64") asf_variant="${TARGETOS}-${TARGETARCH}" ;; \
*) echo "ERROR: Unsupported CPU architecture: ${TARGETARCH}"; exit 1 ;; \ *) echo "ERROR: Unsupported CPU architecture: ${TARGETARCH}"; exit 1 ;; \
esac && \ 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 && \ 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 && \ 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 && \ if [ -d "ArchiSteamFarm/overlay/generic" ]; then cp -pR "ArchiSteamFarm/overlay/generic/"* "out/result"; fi && \

3
Dockerfile.Service
View File

@@ -37,9 +37,6 @@ RUN dotnet --info && \
"arm64") asf_variant="${TARGETOS}-${TARGETARCH}" ;; \ "arm64") asf_variant="${TARGETOS}-${TARGETARCH}" ;; \
*) echo "ERROR: Unsupported CPU architecture: ${TARGETARCH}"; exit 1 ;; \ *) echo "ERROR: Unsupported CPU architecture: ${TARGETARCH}"; exit 1 ;; \
esac && \ 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 && \ 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 && \ 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 && \ if [ -d "ArchiSteamFarm/overlay/${TARGETOS}" ]; then cp -pR "ArchiSteamFarm/overlay/${TARGETOS}/"* "out/result"; fi && \