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

Add osx-arm64 ASF variant (#2451)

Browse Source
This commit is contained in:
Łukasz Domeradzki
2021-11-10 20:36:09 +01:00
committed by GitHub
parent ae3a60759a
commit 0850a261cb
4 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,7 +119,7 @@ jobs:
- name: Publish ArchiSteamFarm on Unix
if: startsWith(matrix.os, 'macos-') || startsWith(matrix.os, 'ubuntu-')
env:
VARIANTS: generic linux-arm linux-arm64 linux-x64 osx-x64 win-x64 # NOTE: When modifying variants, don't forget to update ASF_VARIANT definitions in SharedInfo.cs!
VARIANTS: generic linux-arm linux-arm64 linux-x64 osx-arm64 osx-x64 win-x64 # NOTE: When modifying variants, don't forget to update ASF_VARIANT definitions in SharedInfo.cs!
shell: sh
run: |
set -eu
@@ -220,7 +220,7 @@ jobs:
- name: Publish ArchiSteamFarm on Windows
if: startsWith(matrix.os, 'windows-')
env:
VARIANTS: generic generic-netf linux-arm linux-arm64 linux-x64 osx-x64 win-x64 # NOTE: When modifying variants, don't forget to update ASF_VARIANT definitions in SharedInfo.cs!
VARIANTS: generic generic-netf linux-arm linux-arm64 linux-x64 osx-arm64 osx-x64 win-x64 # NOTE: When modifying variants, don't forget to update ASF_VARIANT definitions in SharedInfo.cs!
shell: pwsh
run: |
Set-StrictMode -Version Latest
@@ -365,6 +365,13 @@ jobs:
name: ${{ matrix.os }}_ASF-linux-x64
path: out/ASF-linux-x64.zip
- name: Upload ASF-osx-arm64
continue-on-error: true
uses: actions/upload-artifact@v2.2.4
with:
name: ${{ matrix.os }}_ASF-osx-arm64
path: out/ASF-osx-arm64.zip
- name: Upload ASF-osx-x64
continue-on-error: true
uses: actions/upload-artifact@v2.2.4
@@ -421,6 +428,12 @@ jobs:
name: windows-latest_ASF-linux-x64
path: out
- name: Download ASF-osx-arm64 artifact from windows-latest
uses: actions/download-artifact@v2.0.10
with:
name: windows-latest_ASF-osx-arm64
path: out
- name: Download ASF-osx-x64 artifact from windows-latest
uses: actions/download-artifact@v2.0.10
with:
@@ -525,6 +538,16 @@ jobs:
asset_name: ASF-linux-x64.zip
asset_content_type: application/zip
- name: Upload ASF-osx-arm64 to GitHub release
uses: actions/upload-release-asset@v1.0.2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.github_release.outputs.upload_url }}
asset_path: out/ASF-osx-arm64.zip
asset_name: ASF-osx-arm64.zip
asset_content_type: application/zip
- name: Upload ASF-osx-x64 to GitHub release
uses: actions/upload-release-asset@v1.0.2
env:

3
ArchiSteamFarm/SharedInfo.cs
View File

@@ -113,6 +113,9 @@ namespace ArchiSteamFarm {
#elif ASF_VARIANT_LINUX_X64
internal static bool CanUpdate => true;
internal static string Variant => "linux-x64";
#elif ASF_VARIANT_OSX_ARM64
internal static bool CanUpdate => true;
internal static string Variant => "osx-arm64";
#elif ASF_VARIANT_OSX_X64
internal static bool CanUpdate => true;
internal static string Variant => "osx-x64";

2
Directory.Build.props
View File

@@ -27,7 +27,7 @@
<RepositoryType>Git</RepositoryType>
<RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
<RollForward>LatestMajor</RollForward>
<RuntimeIdentifiers>linux-arm;linux-arm64;linux-x64;osx-x64;win-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>linux-arm;linux-arm64;linux-x64;osx-arm64;osx-x64;win-x64</RuntimeIdentifiers>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
</PropertyGroup>

1
cc.sh
View File

@@ -87,6 +87,7 @@ cpu_architecture="$(uname -m)"
case "$cpu_architecture" in
"aarch64") cpu_architecture="arm64" ;;
"amd64") cpu_architecture="x64" ;;
"arm64") ;;
"armv7l") cpu_architecture="arm" ;;
"x86_64") cpu_architecture="x64" ;;
*) echo "ERROR: Unknown CPU architecture: ${cpu_architecture}. If you believe that our script should work on your machine, please let us know."; exit 1