From a47ad1076f00beafbc318a037bb60cce1037b7b7 Mon Sep 17 00:00:00 2001 From: mmd-afegbua Date: Tue, 18 Jun 2024 10:22:42 +0100 Subject: [PATCH 1/3] goldsky versioning --- packages/subgraph/tasks/deploy.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/subgraph/tasks/deploy.sh b/packages/subgraph/tasks/deploy.sh index c6011dd757..140ffdcf5f 100755 --- a/packages/subgraph/tasks/deploy.sh +++ b/packages/subgraph/tasks/deploy.sh @@ -126,7 +126,11 @@ deploy_to_goldsky() { local network="$1" # TODO: use tagging? - local subgraphName="protocol-$DEPLOYMENT_ENV-$network/1.0.0" + #Get subgraph version from package.json + PACKAGE_JSON_PATH="package.json" + VERSION_LABEL=$($JQ -r '.version' $PACKAGE_JSON_PATH) + + local subgraphName="protocol-$DEPLOYMENT_ENV-$network/$VERSION_LABEL" # Note: when using Graph CLI to deploy, it implicitly triggers build too, but Goldsky CLI doesn't, so we do it explicitly. $GRAPH_CLI build From e432b1315491d0a43f24bdbe1008e2b3a506d6a6 Mon Sep 17 00:00:00 2001 From: mmd-afegbua Date: Tue, 18 Jun 2024 11:01:26 +0100 Subject: [PATCH 2/3] removed thegraph from vendor list --- .github/workflows/handler.deploy-production-subgraphs.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/handler.deploy-production-subgraphs.yml b/.github/workflows/handler.deploy-production-subgraphs.yml index 4b2d6603de..d1124f6d59 100644 --- a/.github/workflows/handler.deploy-production-subgraphs.yml +++ b/.github/workflows/handler.deploy-production-subgraphs.yml @@ -17,7 +17,6 @@ on: type: choice options: - superfluid - - graph - goldsky - airstack deployment_env: From 6d83ea1e9ac8be5da9c9f746ab815cfbc84b5f5f Mon Sep 17 00:00:00 2001 From: mmd-afegbua Date: Tue, 18 Jun 2024 11:42:27 +0100 Subject: [PATCH 3/3] removed thegraph from pipeline description --- .github/workflows/call.deploy-subgraph.yml | 2 +- .github/workflows/handler.deploy-production-subgraphs.yml | 2 +- packages/subgraph/tasks/deploy.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/call.deploy-subgraph.yml b/.github/workflows/call.deploy-subgraph.yml index 2c2e51709d..e997fddb17 100644 --- 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, goldsky or airstack" + description: "Where to deploy subgraph to; superfluid, goldsky or airstack" type: string deployment_env: required: true diff --git a/.github/workflows/handler.deploy-production-subgraphs.yml b/.github/workflows/handler.deploy-production-subgraphs.yml index d1124f6d59..c2e43093c3 100644 --- a/.github/workflows/handler.deploy-production-subgraphs.yml +++ b/.github/workflows/handler.deploy-production-subgraphs.yml @@ -12,7 +12,7 @@ on: inputs: vendor: required: true - description: "Where to deploy subgraph to; one of `superfluid`, `graph`, `goldsky` or `airstack`" + description: "Where to deploy subgraph to; one of `superfluid`, `goldsky` or `airstack`" default: "superfluid" type: choice options: diff --git a/packages/subgraph/tasks/deploy.sh b/packages/subgraph/tasks/deploy.sh index 140ffdcf5f..2bd385f20b 100755 --- a/packages/subgraph/tasks/deploy.sh +++ b/packages/subgraph/tasks/deploy.sh @@ -128,9 +128,9 @@ deploy_to_goldsky() { #Get subgraph version from package.json PACKAGE_JSON_PATH="package.json" - VERSION_LABEL=$($JQ -r '.version' $PACKAGE_JSON_PATH) + SUBGRAPH_VERSION=$($JQ -r '.version' $PACKAGE_JSON_PATH) - local subgraphName="protocol-$DEPLOYMENT_ENV-$network/$VERSION_LABEL" + local subgraphName="protocol-$DEPLOYMENT_ENV-$network/$SUBGRAPH_VERSION" # Note: when using Graph CLI to deploy, it implicitly triggers build too, but Goldsky CLI doesn't, so we do it explicitly. $GRAPH_CLI build