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

Fix docker builds wrongly announced as custom

Browse Source
This commit is contained in:
JustArchi
2018-05-11 23:20:25 +02:00
parent 0f7e6cc553
commit 47800f0c29
5 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ArchiSteamFarm/ASF.cs
View File

@@ -41,7 +41,7 @@ namespace ArchiSteamFarm {
private static FileSystemWatcher FileSystemWatcher;
internal static async Task<Version> CheckAndUpdateProgram(bool updateOverride = false) {
if (SharedInfo.IsCustomBuild || (Program.GlobalConfig.UpdateChannel == GlobalConfig.EUpdateChannel.None)) {
if (!SharedInfo.BuildInfo.CanUpdate || (Program.GlobalConfig.UpdateChannel == GlobalConfig.EUpdateChannel.None)) {
return null;
}
@@ -139,7 +139,7 @@ namespace ArchiSteamFarm {
return null;
}
const string targetFile = SharedInfo.ASF + "-" + SharedInfo.Variant + ".zip";
string targetFile = SharedInfo.ASF + "-" + SharedInfo.BuildInfo.Variant + ".zip";
GitHub.ReleaseResponse.Asset binaryAsset = releaseResponse.Assets.FirstOrDefault(asset => asset.Name.Equals(targetFile, StringComparison.OrdinalIgnoreCase));
if (binaryAsset == null) {
@@ -168,7 +168,7 @@ namespace ArchiSteamFarm {
return null;
}
if (IsUnixVariant(SharedInfo.Variant)) {
if (OS.IsUnix) {
string executable = Path.Combine(targetDirectory, SharedInfo.AssemblyName);
if (File.Exists(executable)) {
OS.UnixSetFileAccessExecutable(executable);
@@ -212,22 +212,6 @@ namespace ArchiSteamFarm {
FileSystemWatcher.EnableRaisingEvents = true;
}
private static bool IsUnixVariant(string variant) {
if (string.IsNullOrEmpty(variant)) {
ArchiLogger.LogNullError(nameof(variant));
return false;
}
switch (variant) {
case "linux-arm":
case "linux-x64":
case "osx-x64":
return true;
default:
return false;
}
}
private static bool IsValidBotName(string botName) {
if (string.IsNullOrEmpty(botName)) {
ArchiLogger.LogNullError(nameof(botName));

2
ArchiSteamFarm/OS.cs
View File

@@ -27,6 +27,8 @@ using ArchiSteamFarm.Localization;
namespace ArchiSteamFarm {
internal static class OS {
internal static bool IsUnix => RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
internal static void Init(bool systemRequired) {
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
DisableQuickEditMode();

50
ArchiSteamFarm/SharedInfo.cs
View File

@@ -20,24 +20,11 @@
// limitations under the License.
using System;
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
namespace ArchiSteamFarm {
internal static class SharedInfo {
#if ASF_VARIANT_GENERIC
internal const string Variant = "generic";
#elif ASF_VARIANT_LINUX_ARM
internal const string Variant = "linux-arm";
#elif ASF_VARIANT_LINUX_X64
internal const string Variant = "linux-x64";
#elif ASF_VARIANT_OSX_X64
internal const string Variant = "osx-x64";
#elif ASF_VARIANT_WIN_X64
internal const string Variant = "win-x64";
#else
internal const string Variant = SourceVariant;
#endif
internal const ulong ArchiSteamID = 76561198006963719;
internal const string ASF = nameof(ASF);
internal const ulong ASFGroupSteamID = 103582791440160998;
@@ -61,11 +48,38 @@ namespace ArchiSteamFarm {
internal const string UpdateDirectory = "_old";
internal const string WebsiteDirectory = "www";
private const string SourceVariant = "source";
internal static bool IsCustomBuild => Variant == SourceVariant;
internal static Guid ModuleVersion => Assembly.GetEntryAssembly().ManifestModule.ModuleVersionId;
internal static string PublicIdentifier => AssemblyName + (IsCustomBuild ? "-custom" : "");
internal static string PublicIdentifier => AssemblyName + (BuildInfo.IsCustomBuild ? "-custom" : "");
internal static Version Version => Assembly.GetEntryAssembly().GetName().Version;
[SuppressMessage("ReSharper", "ConvertToConstant.Global")]
internal static class BuildInfo {
#if ASF_VARIANT_DOCKER
internal static readonly bool CanUpdate = false;
internal static readonly string Variant = "docker";
#elif ASF_VARIANT_GENERIC
internal static readonly bool CanUpdate = true;
internal static readonly string Variant = "generic";
#elif ASF_VARIANT_LINUX_ARM
internal static readonly bool CanUpdate = true;
internal static readonly string Variant = "linux-arm";
#elif ASF_VARIANT_LINUX_X64
internal static readonly bool CanUpdate = true;
internal static readonly string Variant = "linux-x64";
#elif ASF_VARIANT_OSX_X64
internal static readonly CanUpdate = true;
internal static readonly string Variant = "osx-x64";
#elif ASF_VARIANT_WIN_X64
internal static readonly bool CanUpdate = true;
internal static readonly string Variant = "win-x64";
#else
internal static readonly bool CanUpdate = false;
internal static readonly string Variant = SourceVariant;
#endif
private const string SourceVariant = "source";
internal static bool IsCustomBuild => Variant == SourceVariant;
}
}
}

2
Dockerfile.arm
View File

@@ -2,7 +2,7 @@ FROM microsoft/dotnet:2.0-sdk AS build-env
WORKDIR /app
COPY . ./
RUN dotnet --info && \
dotnet publish ArchiSteamFarm -c Release -o out /nologo && \
dotnet publish ArchiSteamFarm -c Release -o out /nologo /p:ASFVariant=docker && \
cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh" "ArchiSteamFarm/out/ArchiSteamFarm.sh"
FROM microsoft/dotnet:2.0-runtime-stretch-arm32v7

2
Dockerfile.x64
View File

@@ -2,7 +2,7 @@ FROM microsoft/dotnet:2.0-sdk AS build-env
WORKDIR /app
COPY . ./
RUN dotnet --info && \
dotnet publish ArchiSteamFarm -c Release -o out /nologo && \
dotnet publish ArchiSteamFarm -c Release -o out /nologo /p:ASFVariant=docker && \
cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh" "ArchiSteamFarm/out/ArchiSteamFarm.sh"
FROM microsoft/dotnet:2.0-runtime