mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(3p/josh): Bump to latest master

Browse source 
Change-Id: I32104d1cdc6d9cd72543d66bbe2f146e8ac27f6d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4988
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2022-01-18 12:02:31 +03:00 committed by clbot
parent e5181a13ed
commit e0d00b9621
2 changed files with 2 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
third_party/josh/0001-replace-mentions-of-master-with-canon.patch vendored
View file

@ -1,47 +0,0 @@
From 4245dbdcacc3a4d4801a50071ba84379be4e1d2e Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Tue, 1 Jun 2021 23:27:30 +0200
Subject: [PATCH] replace mentions of 'master' with 'canon'
While there are areas of josh that hardcode `master`, we can override
this to make it work for the TVL use-case.
---
josh-proxy/src/bin/josh-proxy.rs | 2 +-
src/housekeeping.rs | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/josh-proxy/src/bin/josh-proxy.rs b/josh-proxy/src/bin/josh-proxy.rs
index 6f15566..76f4a5d 100644
--- a/josh-proxy/src/bin/josh-proxy.rs
+++ b/josh-proxy/src/bin/josh-proxy.rs
@@ -374,7 +374,7 @@ async fn call_service(
let mut headref = parsed_url.headref.trim_start_matches("@").to_owned();
if headref == "" {
- headref = "refs/heads/master".to_string();
+ headref = "refs/heads/canon".to_string();
}
let remote_url = [
diff --git a/src/housekeeping.rs b/src/housekeeping.rs
index 5d08f81..1d55bc4 100644
--- a/src/housekeeping.rs
+++ b/src/housekeeping.rs
@@ -44,12 +44,12 @@ pub fn memorize_from_to(
) -> Vec<(String, String)> {
let mut refs = vec![];
let glob = format!(
- "refs/josh/upstream/{}/refs/heads/master",
+ "refs/josh/upstream/{}/refs/heads/canon",
&to_ns(upstream_repo)
);
for refname in repo.references_glob(&glob).unwrap().names() {
let refname = refname.unwrap();
- let to_ref = format!("refs/{}/heads/master", &namespace);
+ let to_ref = format!("refs/{}/heads/canon", &namespace);
refs.push((refname.to_owned(), to_ref.clone()));
}
--
2.31.1

8
third_party/josh/default.nix vendored
View file

@ -5,8 +5,8 @@ let
src = pkgs.fetchFromGitHub {
owner = "esrlabs";
repo = "josh";
rev = "4a70f2914260066b2db44f4cabe9b80acdd556af";
sha256 = "0gwn3daj24538h5ddksvnyhq4lyjh0br9k49jhbd7r1sm6ly2cwl";
rev = "69dc986e506ba5631c8bbf52835da076a18ec8dc";
hash = "sha256:0ybc6ivjkm7bchaszs9lhbl1gbjnyhwq7a3vw6jml3ama84l52lb";
};
in depot.third_party.naersk.buildPackage {
inherit src;
@ -22,8 +22,4 @@ in depot.third_party.naersk.buildPackage {
"-p" "josh-proxy"
"-p" "josh-ui"
];
overrideMain = x: {
patches = [ ./0001-replace-mentions-of-master-with-canon.patch ];
};
}