diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a363ac9..22a8f61 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,11 +6,24 @@ on: jobs: install_fdb: - name: Install + name: Install FDB ${{ matrix.fdb_version }} on ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-13] + include: + # macOS test variations + - os: macos-13 + fdb_version: '7.3.66' + - os: macos-14 + fdb_version: '7.3.66' + + # Linux test variations + - os: ubuntu-latest + fdb_version: '6.3.25' + - os: ubuntu-latest + fdb_version: '7.1.59' + - os: ubuntu-latest + fdb_version: '7.3.66' runs-on: ${{ matrix.os }} diff --git a/dist/index.js b/dist/index.js index 6e2dcc4..131b4e8 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2886,9 +2886,13 @@ try { break; } case 'darwin': { - let url = `${base_url}/FoundationDB-${version}_x86_64.pkg`; + let arch = os.arch(); + let arch_suffix = arch === 'arm64' ? 'arm64' : 'x86_64'; + let url = `${base_url}/FoundationDB-${version}_${arch_suffix}.pkg`; + let pkg_name = `FoundationDB-${version}_${arch_suffix}.pkg`; + exec(`curl -L -O ${url}`); - exec(`sudo installer -pkg FoundationDB-${version}_x86_64.pkg -target /`); + exec(`sudo installer -pkg ${pkg_name} -target /`); break; } default: diff --git a/index.js b/index.js index 4945a2b..e08b983 100644 --- a/index.js +++ b/index.js @@ -25,9 +25,13 @@ try { break; } case 'darwin': { - let url = `${base_url}/FoundationDB-${version}_x86_64.pkg`; + let arch = os.arch(); + let arch_suffix = arch === 'arm64' ? 'arm64' : 'x86_64'; + let url = `${base_url}/FoundationDB-${version}_${arch_suffix}.pkg`; + let pkg_name = `FoundationDB-${version}_${arch_suffix}.pkg`; + exec(`curl -L -O ${url}`); - exec(`sudo installer -pkg FoundationDB-${version}_x86_64.pkg -target /`); + exec(`sudo installer -pkg ${pkg_name} -target /`); break; } default: