From a8ea3e4e4717717769cdb29dfb18b92854123c1a Mon Sep 17 00:00:00 2001 From: Nick Winans Date: Mon, 5 May 2025 14:45:12 -0700 Subject: [PATCH 1/4] Support linux arm --- src/foreman.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/foreman.ts b/src/foreman.ts index ec8c267..5bf9f97 100644 --- a/src/foreman.ts +++ b/src/foreman.ts @@ -48,6 +48,7 @@ function chooseRelease( function chooseAsset(release: GitHubRelease): GitHubAsset | null { let platformMatcher: (name: string) => boolean; + const arch = os.arch(); if (process.platform === "win32") { platformMatcher = name => @@ -55,7 +56,6 @@ function chooseAsset(release: GitHubRelease): GitHubAsset | null { name.includes("win64") || name.includes("win32"); } else if (process.platform === "darwin") { - const arch = os.arch(); if (arch === "x64") { if (release.tag_name >= "v1.0.5") { platformMatcher = name => name.includes("macos-x86_64"); @@ -66,7 +66,15 @@ function chooseAsset(release: GitHubRelease): GitHubAsset | null { platformMatcher = name => name.includes("macos-arm64"); } } else if (process.platform === "linux") { - platformMatcher = name => name.includes("linux"); + if (arch === "x64") { + if (release.tag_name >= "v1.6.4") { + platformMatcher = name => name.includes("linux-x86_64"); + } else { + platformMatcher = name => name.includes("linux"); + } + } else { + platformMatcher = name => name.includes("linux-arm64"); + } } else { throw new Error(`Unsupported platform "${process.platform}"`); } From f37735cffc6bba92e7e07252105d8dda0a7bae9b Mon Sep 17 00:00:00 2001 From: Nick Winans Date: Mon, 5 May 2025 14:49:37 -0700 Subject: [PATCH 2/4] drop alpha --- foreman.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foreman.toml b/foreman.toml index 9006fd9..2675525 100644 --- a/foreman.toml +++ b/foreman.toml @@ -1,5 +1,5 @@ # This file is used as a way to make sure that setup-foreman is functioning. [tools] -rojo = { source = "Roblox/rojo", version = "0.6.0-alpha.1" } +rojo = { source = "Roblox/rojo", version = "0.6.0" } selene = { source = "Kampfkarren/selene", version = "0.15.0" } From e63e49c9e58be08e487e01fef27b429876d0d35c Mon Sep 17 00:00:00 2001 From: Nick Winans Date: Mon, 5 May 2025 14:50:50 -0700 Subject: [PATCH 3/4] I guess --- foreman.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foreman.toml b/foreman.toml index 2675525..2b895d9 100644 --- a/foreman.toml +++ b/foreman.toml @@ -1,5 +1,5 @@ # This file is used as a way to make sure that setup-foreman is functioning. [tools] -rojo = { source = "Roblox/rojo", version = "0.6.0" } +rojo = { source = "Roblox/rojo", version = "6.0.0" } selene = { source = "Kampfkarren/selene", version = "0.15.0" } From a4ba984fc584faf09d9548c5344415921856d887 Mon Sep 17 00:00:00 2001 From: Nick Winans Date: Mon, 5 May 2025 14:52:25 -0700 Subject: [PATCH 4/4] 22.04 lock --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2ff5f32..53d241c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: name: Test setup-foreman action strategy: matrix: - os: ["ubuntu-latest", "windows-latest", "macos-latest"] + os: ["ubuntu-22.04", "windows-latest", "macos-latest"] runs-on: ${{ matrix.os }} steps: @@ -38,7 +38,7 @@ jobs: name: Test setup-foreman action with working-directory strategy: matrix: - os: ["ubuntu-latest", "windows-latest", "macos-latest"] + os: ["ubuntu-22.04", "windows-latest", "macos-latest"] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -62,7 +62,7 @@ jobs: name: Test allow-external-gitub-org false expect failure strategy: matrix: - os: ["ubuntu-latest"] + os: ["ubuntu-22.04"] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -94,7 +94,7 @@ jobs: name: Test allow-external-gitub-org false expect success strategy: matrix: - os: ["ubuntu-latest"] + os: ["ubuntu-22.04"] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3