[subgraph][fix] explicitly build in the subgraph deploy script for Go…

…ldsky (#1925) * explicitly build in the subgraph deploy script for goldsky * fix comment typo * Update flake.nix * Update flake.nix --------- Co-authored-by: Miao ZhiCheng <[email protected]>
superfluid-finance · Apr 9, 2024 · 6a53cc5 · 6a53cc5
1 parent ba68544
commit 6a53cc5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/call.deploy-subgraph.yml b/.github/workflows/call.deploy-subgraph.yml
@@ -5,7 +5,7 @@ on:
     inputs:
       vendor:
         required: true
-        description: "Where to deploy subgraph to; superfluid, graph, or satsuma"
+        description: "Where to deploy subgraph to; superfluid, graph, satsuma, or goldsky"
         type: string
       deployment_env:
         required: true

diff --git a/flake.nix b/flake.nix
@@ -66,6 +66,12 @@
     node18DevInputs = nodeDevInputsWith pkgs.nodejs_18;
     node20DevInputs = nodeDevInputsWith pkgs.nodejs_20;
 
+    # CI inputs
+    ciInputs = with pkgs; [
+      # codecov requries gnupg binary
+      gnupg
+    ];
+
     # minimem development shell
     minimumDevInputs = commonDevInputs ++ ethDevInputs ++ node18DevInputs;
 
@@ -132,17 +138,18 @@
         ++ whitehatInputs
         ++ specInputs;
     };
+
     # CI shells
     devShells.ci-node18 = mkShell {
-      buildInputs = commonDevInputs ++ ethDevInputs ++ node18DevInputs;
+      buildInputs = ciInputs ++ commonDevInputs ++ ethDevInputs ++ node18DevInputs;
     };
     devShells.ci-node20 = mkShell {
-      buildInputs = commonDevInputs ++ ethDevInputs ++ node20DevInputs;
+      buildInputs = ciInputs ++ commonDevInputs ++ ethDevInputs ++ node20DevInputs;
     };
     devShells.ci-spec-ghc92 = ci-spec-with-ghc ghcVer92;
     devShells.ci-spec-ghc94 = ci-spec-with-ghc ghcVer94;
     devShells.ci-hot-fuzz = mkShell {
-      buildInputs = with pkgs; commonDevInputs ++ ethDevInputs ++ [
+      buildInputs = with pkgs; ciInputs ++ commonDevInputs ++ ethDevInputs ++ [
         slither-analyzer
         echidna
       ];

diff --git a/packages/subgraph/tasks/deploy.sh b/packages/subgraph/tasks/deploy.sh
@@ -126,8 +126,8 @@ deploy_to_goldsky() {
     # TODO: use tagging?
     # TODO: how to handle versions?
 
-    cp subgraph.yaml ./build/subgraph.yaml
-    # TODO: not sure the cp is necessary
+    $GRAPH_CLI build
+    # Note: when using Graph CLI to deploy, it implicitly triggers build too, but Goldsky CLI doesn't.
 
     echo "********* Deploying $network subgraph $subgraphName to Goldsky. **********"
     $GOLDSKY_CLI subgraph deploy \