From 3c49b1657ef4954f059573967e58616dfacf65c8 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Mon, 27 Nov 2023 09:51:03 -0600 Subject: [PATCH] rm: deprecated bors references and files --- README.md | 4 ---- bors.toml | 12 ------------ default.nix | 4 +--- nix/haskell.nix | 2 -- release.nix | 5 +---- 5 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 bors.toml diff --git a/README.md b/README.md index a726620..cc60bd2 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,6 @@

-

- Build status -

- ## Overview In the Cardano multi-asset era, this project helps you create and diff --git a/bors.toml b/bors.toml deleted file mode 100644 index 3bb367f..0000000 --- a/bors.toml +++ /dev/null @@ -1,12 +0,0 @@ -status = [ - # Buildkite: impure builds - "buildkite/offchain-metadata-tools", - # Hydra: build for required jobset - "ci/hydra:Cardano:offchain-metadata-tools:required", - "ci/hydra-eval", - "ci/hydra-build:required", -] -timeout_sec = 7200 -required_approvals = 1 -delete_merged_branches = true -block_labels = [ "WIP", "DO NOT MERGE", "wip" ] diff --git a/default.nix b/default.nix index 6aa3f29..2df8300 100644 --- a/default.nix +++ b/default.nix @@ -15,8 +15,6 @@ , gitrev ? pkgs.iohkNix.commitIdFromGitRepoOrZero ./.git # GitHub PR number (as a string), set when building a Hydra PR jobset. , pr ? null -# Bors job type (as a string), set when building a Hydra bors jobset. -, borsBuild ? null }: with pkgs; with commonLib; let @@ -29,7 +27,7 @@ let buildHaskellProject = args: import ./nix/haskell.nix ({ inherit config pkgs; inherit (pkgs) buildPackages lib stdenv haskell-nix; - inherit src gitrev pr borsBuild; + inherit src gitrev pr; } // args); project = addExtras (buildHaskellProject {}); profiledProject = buildHaskellProject { profiling = true; }; diff --git a/nix/haskell.nix b/nix/haskell.nix index 7e22eae..50d1e46 100644 --- a/nix/haskell.nix +++ b/nix/haskell.nix @@ -13,8 +13,6 @@ , src # GitHub PR number (when building a PR jobset on Hydra) , pr ? null -# Bors job type (when building a bors jobset on Hydra) -, borsBuild ? null # Version info, to be passed when not building from a git work tree , gitrev ? null , libsodium-vrf ? pkgs.libsodium-vrf diff --git a/release.nix b/release.nix index 088ee87..4efbbd7 100644 --- a/release.nix +++ b/release.nix @@ -14,7 +14,7 @@ , projectArgs ? { config = { allowUnfree = false; inHydra = true; }; gitrev = metadata-server.rev; - inherit pr borsBuild sourcesOverride; + inherit pr sourcesOverride; } # The systems that the jobset will be built for. @@ -38,9 +38,6 @@ # GitHub PR number (as a string), provided as a Hydra input , pr ? null -# Can be "staging" or "trying" to indicate that this is a bors jobset -, borsBuild ? null - # Platform filter string for jobset. , platform ? "all" }: