File tree Expand file tree Collapse file tree 3 files changed +27
-6
lines changed Expand file tree Collapse file tree 3 files changed +27
-6
lines changed Original file line number Diff line number Diff line change 66
77jobs :
88 install_fdb :
9- name : Install
9+ name : Install FDB ${{ matrix.fdb_version }} on ${{ matrix.os }}
1010
1111 strategy :
1212 matrix :
13- os : [ubuntu-latest, macos-13]
13+ include :
14+ # macOS test variations
15+ - os : macos-13
16+ fdb_version : ' 7.3.66'
17+ - os : macos-14
18+ fdb_version : ' 7.3.66'
19+
20+ # Linux test variations
21+ - os : ubuntu-latest
22+ fdb_version : ' 6.3.25'
23+ - os : ubuntu-latest
24+ fdb_version : ' 7.1.59'
25+ - os : ubuntu-latest
26+ fdb_version : ' 7.3.66'
1427
1528 runs-on : ${{ matrix.os }}
1629
Original file line number Diff line number Diff line change @@ -2886,9 +2886,13 @@ try {
28862886 break ;
28872887 }
28882888 case 'darwin' : {
2889- let url = `${ base_url } /FoundationDB-${ version } _x86_64.pkg` ;
2889+ let arch = os . arch ( ) ;
2890+ let arch_suffix = arch === 'arm64' ? 'arm64' : 'x86_64' ;
2891+ let url = `${ base_url } /FoundationDB-${ version } _${ arch_suffix } .pkg` ;
2892+ let pkg_name = `FoundationDB-${ version } _${ arch_suffix } .pkg` ;
2893+
28902894 exec ( `curl -L -O ${ url } ` ) ;
2891- exec ( `sudo installer -pkg FoundationDB- ${ version } _x86_64.pkg -target /` ) ;
2895+ exec ( `sudo installer -pkg ${ pkg_name } -target /` ) ;
28922896 break ;
28932897 }
28942898 default :
Original file line number Diff line number Diff line change 2525 break ;
2626 }
2727 case 'darwin' : {
28- let url = `${ base_url } /FoundationDB-${ version } _x86_64.pkg` ;
28+ let arch = os . arch ( ) ;
29+ let arch_suffix = arch === 'arm64' ? 'arm64' : 'x86_64' ;
30+ let url = `${ base_url } /FoundationDB-${ version } _${ arch_suffix } .pkg` ;
31+ let pkg_name = `FoundationDB-${ version } _${ arch_suffix } .pkg` ;
32+
2933 exec ( `curl -L -O ${ url } ` ) ;
30- exec ( `sudo installer -pkg FoundationDB- ${ version } _x86_64.pkg -target /` ) ;
34+ exec ( `sudo installer -pkg ${ pkg_name } -target /` ) ;
3135 break ;
3236 }
3337 default :
You can’t perform that action at this time.
0 commit comments