Skip to content

Commit b1303c6

Browse files
authored
Support linux arm (#50)
* Support linux arm * drop alpha * I guess * 22.04 lock
1 parent 7e947e4 commit b1303c6

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: Test setup-foreman action
1313
strategy:
1414
matrix:
15-
os: ["ubuntu-latest", "windows-latest", "macos-latest"]
15+
os: ["ubuntu-22.04", "windows-latest", "macos-latest"]
1616

1717
runs-on: ${{ matrix.os }}
1818
steps:
@@ -38,7 +38,7 @@ jobs:
3838
name: Test setup-foreman action with working-directory
3939
strategy:
4040
matrix:
41-
os: ["ubuntu-latest", "windows-latest", "macos-latest"]
41+
os: ["ubuntu-22.04", "windows-latest", "macos-latest"]
4242
runs-on: ${{ matrix.os }}
4343
steps:
4444
- uses: actions/checkout@v3
@@ -62,7 +62,7 @@ jobs:
6262
name: Test allow-external-gitub-org false expect failure
6363
strategy:
6464
matrix:
65-
os: ["ubuntu-latest"]
65+
os: ["ubuntu-22.04"]
6666
runs-on: ${{ matrix.os }}
6767
steps:
6868
- uses: actions/checkout@v3
@@ -94,7 +94,7 @@ jobs:
9494
name: Test allow-external-gitub-org false expect success
9595
strategy:
9696
matrix:
97-
os: ["ubuntu-latest"]
97+
os: ["ubuntu-22.04"]
9898
runs-on: ${{ matrix.os }}
9999
steps:
100100
- uses: actions/checkout@v3

foreman.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This file is used as a way to make sure that setup-foreman is functioning.
22

33
[tools]
4-
rojo = { source = "Roblox/rojo", version = "0.6.0-alpha.1" }
4+
rojo = { source = "Roblox/rojo", version = "6.0.0" }
55
selene = { source = "Kampfkarren/selene", version = "0.15.0" }

src/foreman.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ function chooseRelease(
4848

4949
function chooseAsset(release: GitHubRelease): GitHubAsset | null {
5050
let platformMatcher: (name: string) => boolean;
51+
const arch = os.arch();
5152

5253
if (process.platform === "win32") {
5354
platformMatcher = name =>
5455
name.includes("windows") ||
5556
name.includes("win64") ||
5657
name.includes("win32");
5758
} else if (process.platform === "darwin") {
58-
const arch = os.arch();
5959
if (arch === "x64") {
6060
if (release.tag_name >= "v1.0.5") {
6161
platformMatcher = name => name.includes("macos-x86_64");
@@ -66,7 +66,15 @@ function chooseAsset(release: GitHubRelease): GitHubAsset | null {
6666
platformMatcher = name => name.includes("macos-arm64");
6767
}
6868
} else if (process.platform === "linux") {
69-
platformMatcher = name => name.includes("linux");
69+
if (arch === "x64") {
70+
if (release.tag_name >= "v1.6.4") {
71+
platformMatcher = name => name.includes("linux-x86_64");
72+
} else {
73+
platformMatcher = name => name.includes("linux");
74+
}
75+
} else {
76+
platformMatcher = name => name.includes("linux-arm64");
77+
}
7078
} else {
7179
throw new Error(`Unsupported platform "${process.platform}"`);
7280
}

0 commit comments

Comments
 (0)