Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@ on:

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
runs-on: ${{ matrix.os }}
defaults:
run:
shell: bash
steps:
- name: Checkout
uses: actions/checkout@v6
Expand All @@ -22,9 +28,13 @@ jobs:

- name: Setup
run: |
build/jag setup --skip-assets
SDK_PATH="$(build/jag setup --print-path sdk)"
ASSETS_PATH="$(build/jag setup --print-path assets)"
JAG_BINARY=build/jag
if [[ "${{ runner.os }}" == "Windows" ]]; then
JAG_BINARY=build/jag.exe
fi
$JAG_BINARY setup --skip-assets
SDK_PATH="$($JAG_BINARY setup --print-path sdk)"
ASSETS_PATH="$($JAG_BINARY setup --print-path assets)"
mkdir -p "$ASSETS_PATH"
make SDK_PATH="$SDK_PATH" assets
cp -r build/assets/* "$ASSETS_PATH"
Expand Down
8 changes: 1 addition & 7 deletions cmd/jag/commands/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,7 @@ func getToitSDKURL(version string) (string, error) {
currARCH := runtime.GOARCH
selector := ""
if currOS == "darwin" {
if currARCH == "amd64" {
selector = "macos-x64"
} else if currARCH == "arm64" {
selector = "macos-aarch64"
} else {
return "", fmt.Errorf("unsupported architecture %s for macOS", currARCH)
}
selector = "macos"
} else if currOS == "linux" {
if currARCH == "amd64" {
selector = "linux-x64"
Expand Down