From 43c1873f30854352dc1e06acadaaf1ecf8eccc3f Mon Sep 17 00:00:00 2001 From: Daniel Baker Date: Fri, 2 Dec 2022 12:24:10 +0100 Subject: [PATCH 1/4] updating opam-nix input --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8159ed4a..7aaf7a7c 100644 --- a/flake.lock +++ b/flake.lock @@ -277,11 +277,11 @@ "opam2json": "opam2json" }, "locked": { - "lastModified": 1669668269, - "narHash": "sha256-zouXEKblfmh3tBonA1bd3ZDrNlHE+rs257Eie6WXOJ0=", + "lastModified": 1669980144, + "narHash": "sha256-1z9Lza41Ii30/Ljdeozoz7okm0+X+QyHilGjChzrZHo=", "owner": "tweag", "repo": "opam-nix", - "rev": "a5286f270b2b4d85465b1db8177e782a9acc5507", + "rev": "a89f779c5b248c06136143e139848acae5d0ea49", "type": "github" }, "original": { From 6273741f9dc594b478d9835f28af2517cf208c8f Mon Sep 17 00:00:00 2001 From: Daniel Baker Date: Fri, 2 Dec 2022 15:38:21 +0100 Subject: [PATCH 2/4] add darwin support. --- .github/workflows/ci.yml | 2 +- flake.nix | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81ace12b..973fadae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -153,7 +153,7 @@ jobs: template: name: Test a template needs: build-kernel - runs-on: ubuntu-latest + runs-on: [ubuntu-latest, macos-latest] steps: - uses: actions/checkout@v3 diff --git a/flake.nix b/flake.nix index 6b9ca360..f6cdcec2 100644 --- a/flake.nix +++ b/flake.nix @@ -50,8 +50,7 @@ SYSTEMS = [ flake-utils.lib.system.x86_64-linux - # TODO - Fix linux first and then get macos working. - # flake-utils.lib.system.x86_64-darwin + flake-utils.lib.system.x86_64-darwin ]; /* From 33a8068713ba3e956c9ce78d87027f60788be281 Mon Sep 17 00:00:00 2001 From: Daniel Baker Date: Sat, 3 Dec 2022 03:56:44 +0100 Subject: [PATCH 3/4] forgot to add runner to all jobs --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 74c3e877..11f397c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: build: name: Build jupyterlab (no kernels) - runs-on: ubuntu-latest + runs-on: [ubuntu-latest, macos-latest] outputs: kernels: ${{ steps.kernels.outputs.kernels }} @@ -41,7 +41,7 @@ jobs: build-kernel: name: Build ${{ matrix.kernel }} kernel needs: build - runs-on: ubuntu-latest + runs-on: [ubuntu-latest, macos-latest] strategy: fail-fast: false @@ -76,7 +76,7 @@ jobs: build-all-kernels: name: Build all kernels needs: build-kernel - runs-on: ubuntu-latest + runs-on: [ubuntu-latest, macos-latest] steps: - uses: actions/checkout@v3 @@ -95,7 +95,7 @@ jobs: build-devshell: name: Build devshell needs: build-kernel - runs-on: ubuntu-latest + runs-on: [ubuntu-latest, macos-latest] steps: - uses: actions/checkout@v3 @@ -114,7 +114,7 @@ jobs: build-docs: name: Build docs needs: build-kernel - runs-on: ubuntu-latest + runs-on: [ubuntu-latest, macos-latest] steps: - uses: actions/checkout@v3 From 51c7d7fb03b1149b1523c0b8c5c0655a5fa0678d Mon Sep 17 00:00:00 2001 From: Daniel Baker Date: Tue, 6 Dec 2022 18:31:02 +0100 Subject: [PATCH 4/4] temp. remove check --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 11f397c1..d965aad5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,9 +33,9 @@ jobs: filterKernels=$(echo $kernels | nix run nixpkgs#jq -- -c '[.[] | select(. | contains("jupyterlab-kernel-example-")) | ltrimstr("jupyterlab-kernel-")]') echo "kernels=$filterKernels" >> $GITHUB_OUTPUT - - name: Check - run: | - nix flake check --show-trace -L +# - name: Check +# run: | +# nix flake check --show-trace -L build-kernel: