From 2c93d1684e44dcec160083eafd1144e4ddeb0ad8 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 14 Apr 2020 06:00:35 -0700 Subject: enable important_pkg on OSX (#13954) * enable important_pkg on OSX * disable some important_packages on OSX * fixup * enable nigui by installing dependency --- azure-pipelines.yml | 4 ++++ testament/important_packages.nim | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d02ac1091..57b494bac 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -34,6 +34,10 @@ jobs: vmImage: 'ubuntu-16.04' CPU: amd64 NIM_TEST_PACKAGES: true + OSX_amd64_pkg: + vmImage: 'macOS-10.15' + CPU: amd64 + NIM_TEST_PACKAGES: true pool: vmImage: $(vmImage) diff --git a/testament/important_packages.nim b/testament/important_packages.nim index 21a40257f..a78f79b7d 100644 --- a/testament/important_packages.nim +++ b/testament/important_packages.nim @@ -1,3 +1,4 @@ +import os template pkg(name: string; hasDeps = false; cmd = "nimble test"; url = ""): untyped = packages.add((name, cmd, hasDeps, url)) @@ -17,7 +18,8 @@ pkg "c2nim", false, "nim c testsuite/tester.nim" pkg "cascade" pkg "chroma" pkg "chronicles", true, "nim c -o:chr -r chronicles.nim" -pkg "chronos", true +when not defined(osx): # testdatagram.nim(560, 54): Check failed + pkg "chronos", true pkg "cligen", false, "nim c -o:cligenn -r cligen.nim" pkg "coco", true pkg "combparser" @@ -46,7 +48,13 @@ pkg "nake", false, "nim c nakefile.nim" pkg "neo", true, "nim c -d:blas=openblas tests/all.nim" # pkg "nico", true pkg "nicy", false, "nim c src/nicy.nim" + +when defined(osx): + # do this more generally by installing non-nim dependencies automatically + # as specified in nimble file + doAssert execShellCmd("brew install gtk+3") == 0 pkg "nigui", false, "nim c -o:niguii -r src/nigui.nim" + pkg "nimcrypto", false, "nim c -r tests/testall.nim" pkg "NimData", true, "nim c -o:nimdataa src/nimdata.nim" pkg "nimes", true, "nim c src/nimes.nim" -- cgit 1.4.1-2-gfad0