From 4a10a60eeb09b5d9082f00c1b6af55437b5d1123 Mon Sep 17 00:00:00 2001 From: iko Date: Tue, 18 Jul 2023 19:29:28 +0300 Subject: [PATCH 1/2] Use released urbit binaries --- .github/workflows/shared.yml | 16 ++++++++++++++++ flake.nix | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/shared.yml b/.github/workflows/shared.yml index 5370408b26..ef8f6ceb23 100644 --- a/.github/workflows/shared.yml +++ b/.github/workflows/shared.yml @@ -79,4 +79,20 @@ jobs: - if: ${{ matrix.os == 'ubuntu-latest' }} name: run urbit-tests run: | + if [[ "${{ inputs.next }}" == "next/kelvin/"* ]]; then + next=$(echo ${{ inputs.next }} | sed 's/[^0-9]//g') + base="https://bootstrap.urbit.org/vere/next/kelvin/${next}" + elif [[ "${{ github.head_ref }}" == "next/kelvin"* ]]; then + next=$(echo ${{ github.head_ref }} | sed 's/[^0-9]//g') + base="https://bootstrap.urbit.org/vere/next/kelvin/${next}" + else + base="https://bootstrap.urbit.org/vere/${{ inputs.pace }}" + fi + vere=$(curl ${base}/last) + url="$(echo ${base}/v${vere}/vere-v${vere}-linux-x86_64)" + echo $vere + echo $url + curl -Lo urbit "$url" + chmod +x urbit + nix flake check --keep-build-log -L diff --git a/flake.nix b/flake.nix index fdaffcf77c..5f11eca88f 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ pkgs = import nixpkgs { inherit system; }; bootFakeShip = { pill, arvo }: pkgs.runCommand "fake-pier" { } '' - ${pkgs.urbit}/bin/urbit --pier $out -F zod -B ${pill} -l -x -t -A ${arvo} + ${./urbit} --pier $out -F zod -B ${pill} -l -x -t -A ${arvo} ''; fakePier = bootFakeShip { pill = ./bin/solid.pill; @@ -48,7 +48,7 @@ pkgs.runCommand ("${pill}.pill") { buildInputs = [ pkgs.netcat ]; } '' cp -r ${fakePier} pier chmod +w -R pier - ${pkgs.urbit}/bin/urbit -d pier + ${./urbit} -d pier ${usableTools}/pkg/click/click -k -p -i ${buildPillThread pill} pier # Sleep to let urbit spin down properly From 402d706d6b200b4c857348f61e3f8e7ccb82efaa Mon Sep 17 00:00:00 2001 From: iko Date: Tue, 18 Jul 2023 19:32:30 +0300 Subject: [PATCH 2/2] Git add binary --- .github/workflows/shared.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/shared.yml b/.github/workflows/shared.yml index ef8f6ceb23..8c8e8a507c 100644 --- a/.github/workflows/shared.yml +++ b/.github/workflows/shared.yml @@ -94,5 +94,6 @@ jobs: echo $url curl -Lo urbit "$url" chmod +x urbit + git add urbit nix flake check --keep-build-log -L