Skip to content

Commit

Permalink
Use latest armadillo, and add latest ubuntu and macos to compatibilit…
Browse files Browse the repository at this point in the history
…y testing.
  • Loading branch information
pauldruce committed Nov 21, 2023
1 parent 3a28702 commit ca0eea5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ jobs:
matrix:
BUILD_TYPE: [ Release ]
OS: [ ubuntu-latest, macos-latest ]
ARMA_VERSION: [11.2.3]
ARMA_VERSION: [ 12.6.6 ]


# The CMake configure and build commands are platform-agnostic and should
# work equally well on Windows or Mac. You can convert this to a matrix
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/combination_selection.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,18 @@ def create_new_matrix(subset):
def main(random_seed, num_selected, select_all):
build_type = ["Release"]
os_versions = [
"ubuntu-latest",
"ubuntu-20.04",
"macos-13",
"macos-latest"
]
armadillo_version = ["10.8.2", "11.2.3"]
armadillo_version = ["10.8.2", "11.4.4"]

list_of_lists = [build_type, os_versions, armadillo_version]

combinations = [p for p in itertools.product(*list_of_lists)]

if select_all == False:
if not select_all:
subset = create_combination_selection(combinations, random_seed, num_selected)
else:
subset = combinations
Expand Down Expand Up @@ -65,13 +67,8 @@ def main(random_seed, num_selected, select_all):
else:
random_seed = int(command_line_arguments[1])

if (len(command_line_arguments) == 3):
if len(command_line_arguments) == 3:
random_seed = int(command_line_arguments[1])
num_selected = int(command_line_arguments[2])

sys.exit(main(random_seed, num_selected, select_all))

# Proving that we can recreate the combinations by setting the random.seed
# for i in range(10):
# random.seed(1)
# print(random.sample(combinations, 3))

0 comments on commit ca0eea5

Please sign in to comment.