diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml deleted file mode 100644 index 03438cc..0000000 --- a/.github/workflows/ci.yaml +++ /dev/null @@ -1,35 +0,0 @@ -name: CI - -on: - push: - branches: [main] - pull_request: - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout the code - uses: actions/checkout@v3 - - - name: Install Nix - uses: cachix/install-nix-action@v22 - with: - nix_path: nixpkgs=channel:nixos-unstable - install_url: https://releases.nixos.org/nix/nix-2.16.0/install - extra_nix_config: | - extra-trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= - extra-substituters = https://cache.iog.io - experimental-features = nix-command flakes - - - name: Build Nix Shell - run: | - nix build .#devShells.x86_64-linux.default - - - name: Build Marlowe Payouts (with Nix) - run: | - nix build .#marlowe-payouts -L - - - name: Build Marlowe Payouts (inside nix develop) - run: | - nix develop --command bash -c 'npm install && npm run build' \ No newline at end of file diff --git a/flake.lock b/flake.lock index 1ebde0b..5ec0605 100644 --- a/flake.lock +++ b/flake.lock @@ -490,11 +490,11 @@ "sphinxcontrib-haddock": "sphinxcontrib-haddock" }, "locked": { - "lastModified": 1697628614, - "narHash": "sha256-9T8zPc1cwf9xsfZ9XWn8pQaN+pmp5sabzm8iRNEESUQ=", + "lastModified": 1698143770, + "narHash": "sha256-5CGqQI9QcLR/434OuubLOoLznEdxN2HUxctoFFu+PUs=", "owner": "input-output-hk", "repo": "iogx", - "rev": "274cf3e3b33ac151e0cae54848f7c2ea9232f1e2", + "rev": "6257702889f22c468071985a7c1bc0677e50d7d3", "type": "github" }, "original": { diff --git a/nix/marlowe-payouts.nix b/nix/marlowe-payouts.nix index 977eec2..86e39eb 100644 --- a/nix/marlowe-payouts.nix +++ b/nix/marlowe-payouts.nix @@ -28,7 +28,10 @@ pkgs.buildNpmPackage { nativeBuildInputs = [ pkgs.nodejs_18 pkgs.nodejs_18.pkgs.webpack-cli - pkgs.python39 + pkgs.python310 + ] ++ lib.optionals pkgs.stdenv.isDarwin [ + # Needed by node-gyp on macOS, which uses the xcrun program. + pkgs.xcbuild ]; buildPhase = '' diff --git a/nix/outputs.nix b/nix/outputs.nix index 3d5d962..707582a 100644 --- a/nix/outputs.nix +++ b/nix/outputs.nix @@ -5,5 +5,9 @@ devShells.default = repoRoot.nix.shell; packages.marlowe-payouts = repoRoot.nix.marlowe-payouts; + + hydraJobs.devShells.default = repoRoot.nix.shell; + hydraJobs.marlowe-payouts = repoRoot.nix.marlowe-payouts; + hydraJobs.required = lib.iogx.mkHydraRequiredJob { }; } ]