diff options
| author | Miran <narimiran@disroot.org> | 2020-05-18 09:03:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-18 09:03:01 +0200 |
| commit | 69cc1ddc4d6aa55e717ef6d57401577d4825def8 (patch) | |
| tree | 4a4e09875df04b3e33fbbfba899e887a852d6a2b | |
| parent | 51578be296ef06013993b4377bde7a0322c0ccb7 (diff) | |
| download | Nim-69cc1ddc4d6aa55e717ef6d57401577d4825def8.tar.gz | |
install gtk3 on osx for package testing (#14388)
| -rw-r--r-- | .github/workflows/ci_packages.yml | 2 | ||||
| -rw-r--r-- | testament/important_packages.nim | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/.github/workflows/ci_packages.yml b/.github/workflows/ci_packages.yml index 53e698022..6cf41aa8e 100644 --- a/.github/workflows/ci_packages.yml +++ b/.github/workflows/ci_packages.yml @@ -36,7 +36,7 @@ jobs: valgrind libc6-dbg libblas-dev - name: 'Install dependencies (macOS)' if: runner.os == 'macOS' - run: brew install boehmgc make sfml + run: brew install boehmgc make sfml gtk+3 - name: 'Install dependencies (Windows)' if: runner.os == 'Windows' shell: bash diff --git a/testament/important_packages.nim b/testament/important_packages.nim index cdb98745c..1d3b1917c 100644 --- a/testament/important_packages.nim +++ b/testament/important_packages.nim @@ -1,5 +1,3 @@ -import os - template pkg1(name: string; hasDeps = false; cmd = "nimble test"; url = ""): untyped = packages1.add((name, cmd, hasDeps, url)) @@ -75,11 +73,6 @@ pkg2 "neo", true, "nim c -d:blas=openblas tests/all.nim" pkg2 "nesm" # pkg2 "nico", true pkg2 "nicy", false, "nim c -r src/nicy.nim" -when defined(osx): - # xxx: do this more generally by installing non-nim dependencies automatically - # as specified in nimble file and calling `distros.foreignDepInstallCmd`, but - # it currently would fail work if a package is already installed. - doAssert execShellCmd("brew ls --versions gtk+3 || brew install gtk+3") == 0 pkg2 "nigui", false, "nim c -o:niguii -r src/nigui.nim" pkg2 "NimData", true, "nim c -o:nimdataa src/nimdata.nim" pkg2 "nimes", true, "nim c src/nimes.nim" |