From 3ace90432f3791166ee04cbfd956ec6e0fcc4e25 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Fri, 15 May 2020 17:43:09 +0200 Subject: [PATCH] Closes #1544 --- .github/workflows/ci.yml | 6 +++--- .travis.yml | 4 ++-- Dockerfile.Service.arm | 4 ++-- Dockerfile.Service.arm64 | 4 ++-- Dockerfile.Service.x64 | 4 ++-- Dockerfile.arm | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.x64 | 2 +- appveyor.yml | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b8674620..80324ace0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ on: [push, pull_request] env: CONFIGURATION: Release DOTNET_CLI_TELEMETRY_OPTOUT: 1 - DOTNET_SDK_VERSION: 3.1.201 + DOTNET_SDK_VERSION: 3.1.202 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 GITHUB_JOBS: 2 # 2-core CPU, without HT: https://help.github.com/en/actions/automating-your-workflow-with-github-actions/virtual-environments-for-github-hosted-runners#supported-runners-and-hardware-resources NET_CORE_VERSION: netcoreapp3.1 @@ -82,7 +82,7 @@ jobs: if [ "$1" = 'generic' ]; then local variantArgs="-p:UseAppHost=false" else - local variantArgs="-p:PublishTrimmed=true -r $1" + local variantArgs="-p:PublishSingleFile=true -p:PublishTrimmed=true -r $1" fi dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${1}" "-p:ASFVariant=$1" --no-restore --nologo $variantArgs @@ -147,7 +147,7 @@ jobs: if ($variant -like 'generic*') { $variantArgs = '-p:UseAppHost=false' } else { - $variantArgs = '-p:PublishTrimmed=true', '-r', "$variant" + $variantArgs = '-p:PublishSingleFile=true', '-p:PublishTrimmed=true', '-r', "$variant" } dotnet publish ArchiSteamFarm -c "$env:CONFIGURATION" -f "$targetFramework" -o "out\$variant" "-p:ASFVariant=$variant" --no-restore --nologo $variantArgs diff --git a/.travis.yml b/.travis.yml index 34c9f4091..7b0e493d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ script: if [ "$1" = 'generic' ]; then local variantArgs="-p:UseAppHost=false" else - local variantArgs="-p:PublishTrimmed=true -r $1" + local variantArgs="-p:PublishSingleFile=true -p:PublishTrimmed=true -r $1" fi dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${1}" "-p:ASFVariant=$1" --no-restore --nologo $variantArgs @@ -94,5 +94,5 @@ matrix: dist: bionic - os: osx # Ref: https://docs.travis-ci.com/user/reference/osx - dotnet: 3.1.201 # For OSX, we need absolute dotnet version until https://github.com/dotnet/core-setup/issues/4187 is resolved + dotnet: 3.1.202 # For OSX, we need absolute dotnet version until https://github.com/dotnet/core-setup/issues/4187 is resolved osx_image: xcode11.4 diff --git a/Dockerfile.Service.arm b/Dockerfile.Service.arm index 2ba52dd39..7b5876d74 100644 --- a/Dockerfile.Service.arm +++ b/Dockerfile.Service.arm @@ -23,8 +23,8 @@ RUN dotnet --info && \ dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm --nologo && \ dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm --nologo && \ dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm --nologo && \ - dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=linux-arm -p:PublishTrimmed=true -r linux-arm --nologo && \ - cp "ArchiSteamFarm/overlay/linux-arm/ArchiSteamFarm-Service.sh" "out/ArchiSteamFarm-Service.sh" + dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=linux-arm -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-arm --nologo && \ + if [ -d "ArchiSteamFarm/overlay/linux-arm" ]; then cp "ArchiSteamFarm/overlay/linux-arm/"* "out"; fi FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1-buster-slim-arm32v7 AS runtime ENV ASPNETCORE_URLS= diff --git a/Dockerfile.Service.arm64 b/Dockerfile.Service.arm64 index 4dabf3280..8ac26215a 100644 --- a/Dockerfile.Service.arm64 +++ b/Dockerfile.Service.arm64 @@ -23,8 +23,8 @@ RUN dotnet --info && \ dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm64 --nologo && \ dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm64 --nologo && \ dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm64 --nologo && \ - dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=linux-arm64 -p:PublishTrimmed=true -r linux-arm64 --nologo && \ - cp "ArchiSteamFarm/overlay/linux-arm64/ArchiSteamFarm-Service.sh" "out/ArchiSteamFarm-Service.sh" + dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=linux-arm64 -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-arm64 --nologo && \ + if [ -d "ArchiSteamFarm/overlay/linux-arm64" ]; then cp "ArchiSteamFarm/overlay/linux-arm64/"* "out"; fi FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1-buster-slim-arm64v8 AS runtime ENV ASPNETCORE_URLS= diff --git a/Dockerfile.Service.x64 b/Dockerfile.Service.x64 index 3ddb822f2..69518ecc7 100644 --- a/Dockerfile.Service.x64 +++ b/Dockerfile.Service.x64 @@ -23,8 +23,8 @@ RUN dotnet --info && \ dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-x64 --nologo && \ dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-x64 --nologo && \ dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-x64 --nologo && \ - dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=linux-x64 -p:PublishTrimmed=true -r linux-x64 --nologo && \ - cp "ArchiSteamFarm/overlay/linux-x64/ArchiSteamFarm-Service.sh" "out/ArchiSteamFarm-Service.sh" + dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=linux-x64 -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-x64 --nologo && \ + if [ -d "ArchiSteamFarm/overlay/linux-x64" ]; then cp "ArchiSteamFarm/overlay/linux-x64/"* "out"; fi FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1-buster-slim AS runtime ENV ASPNETCORE_URLS= diff --git a/Dockerfile.arm b/Dockerfile.arm index ae804727a..8e5137992 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -24,7 +24,7 @@ RUN dotnet --info && \ dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm --nologo && \ dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm --nologo && \ dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=docker -p:SelfContained=false -p:UseAppHost=false -r linux-arm --nologo && \ - cp "ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh" "out/ArchiSteamFarm.sh" + if [ -d "ArchiSteamFarm/overlay/generic" ]; then cp "ArchiSteamFarm/overlay/generic/"* "out"; fi FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim-arm32v7 AS runtime ENV ASPNETCORE_URLS= diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index bf65ec877..9030a5788 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -24,7 +24,7 @@ RUN dotnet --info && \ dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm64 --nologo && \ dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-arm64 --nologo && \ dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=docker -p:SelfContained=false -p:UseAppHost=false -r linux-arm64 --nologo && \ - cp "ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh" "out/ArchiSteamFarm.sh" + if [ -d "ArchiSteamFarm/overlay/generic" ]; then cp "ArchiSteamFarm/overlay/generic/"* "out"; fi FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim-arm64v8 AS runtime ENV ASPNETCORE_URLS= diff --git a/Dockerfile.x64 b/Dockerfile.x64 index fba40bd8e..2d32aedf3 100644 --- a/Dockerfile.x64 +++ b/Dockerfile.x64 @@ -24,7 +24,7 @@ RUN dotnet --info && \ dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-x64 --nologo && \ dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -p:SelfContained=false -p:UseAppHost=false -r linux-x64 --nologo && \ dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=docker -p:SelfContained=false -p:UseAppHost=false -r linux-x64 --nologo && \ - cp "ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh" "out/ArchiSteamFarm.sh" + if [ -d "ArchiSteamFarm/overlay/generic" ]; then cp "ArchiSteamFarm/overlay/generic/"* "out"; fi FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS runtime ENV ASPNETCORE_URLS= diff --git a/appveyor.yml b/appveyor.yml index 8c16d93fa..01e686444 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -170,7 +170,7 @@ after_test: if ($variant -like 'generic*') { $variantArgs = '-p:UseAppHost=false' } else { - $variantArgs = '-p:PublishTrimmed=true', '-r', "$variant" + $variantArgs = '-p:PublishSingleFile=true', '-p:PublishTrimmed=true', '-r', "$variant" } dotnet publish ArchiSteamFarm -c "$env:CONFIGURATION" -f "$targetFramework" -o "out\$variant" "-p:ASFVariant=$variant" --no-restore --nologo $variantArgs