From 8088ab7908ad5e720057c93eb2b76de0cbabca3d Mon Sep 17 00:00:00 2001 From: Richard Watts Date: Thu, 12 Sep 2024 17:45:02 +0100 Subject: [PATCH] (fix) Move zq2 back onto mainline (fix) Try yet again to get git to update the cached zq2 sensibly --- docgen/src/main.rs | 12 +++++++++++- zq2_spec.yaml | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docgen/src/main.rs b/docgen/src/main.rs index 2cdc388..e452d3a 100644 --- a/docgen/src/main.rs +++ b/docgen/src/main.rs @@ -269,7 +269,17 @@ async fn main() -> Result<()> { if fs::metadata(zq2_checkout_dir.clone().join(".git")).is_ok() { // Update. CommandBuilder::new() - .cmd("git", &["pull", "https://github.com/zilliqa/zq2", refspec]) + .cmd( + "git", + &[ + "fetch", + "--depth=1", + "-f", + "-u", + "https://github.com/zilliqa/zq2", + refspec, + ], + ) .current_dir(&zq2_checkout_dir.clone())? .run_logged() .await? diff --git a/zq2_spec.yaml b/zq2_spec.yaml index cebc725..87d84d2 100644 --- a/zq2_spec.yaml +++ b/zq2_spec.yaml @@ -1,4 +1,4 @@ versions: - - refspec: 4914811983d965da3eb176979984ca219aa8bbc3 + - refspec: 033cc034a083151fded32092437302d042fe80ee name: APIs api_url: "https://api.zq2-prototestnet.zilliqa.com/"