From 12dcf3702077e4afcce0f5b5d1ff24c95a43535b Mon Sep 17 00:00:00 2001
From: Daniel Harvey <danieljamesharvey@gmail.com>
Date: Tue, 20 Aug 2024 10:41:08 +0100
Subject: [PATCH] Specify major ndc-postgres version to cargo update (#588)

<!-- The PR description should answer 2 (maybe 3) important questions:
-->

### What

`cargo update` quite helpfully errors when we do something ambiguous
like `cargo update ndc-postgres` when there's two of them, so let's
disambiguate the one we want.


https://github.com/hasura/ndc-postgres/actions/runs/10468915177/job/28990809823#step:5:92

### How

Change job to `cargo update ndc-postgres@1`, essentially.
---
 .github/workflows/update-multitenant-dep.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/update-multitenant-dep.yaml b/.github/workflows/update-multitenant-dep.yaml
index 969040a2..0e0c88a7 100644
--- a/.github/workflows/update-multitenant-dep.yaml
+++ b/.github/workflows/update-multitenant-dep.yaml
@@ -53,20 +53,20 @@ jobs:
           # there will be multiple `ndc-postgres` deps, so we target a specific
           # one, presumably the latest version. This will need updating as we
           # add new `ndc-postgres` versions into `ndc-postgres-multitenant`
-          LATEST_NDC_POSTGRES_VERSION="v1"
+          LATEST_NDC_POSTGRES_VERSION="1"
 
           # Update the hash for ndc-postgres
-          sed -i -e "/ndc-postgres_${LATEST_NDC_POSTGRES_VERSION}/s/rev[ ]*=[ ]*\"[[:alnum:]]*\"/rev = \"$LATEST_SHA\"/g" $DEP_FILEPATH
+          sed -i -e "/ndc-postgres_v${LATEST_NDC_POSTGRES_VERSION}/s/rev[ ]*=[ ]*\"[[:alnum:]]*\"/rev = \"$LATEST_SHA\"/g" $DEP_FILEPATH
 
           # Update the hash for ndc-postgres-configuration
-          sed -i -e "/ndc-postgres-configuration_${LATEST_NDC_POSTGRES_VERSION}/s/rev[ ]*=[ ]*\"[[:alnum:]]*\"/rev = \"$LATEST_SHA\"/g" $DEP_FILEPATH
+          sed -i -e "/ndc-postgres-configuration_v${LATEST_NDC_POSTGRES_VERSION}/s/rev[ ]*=[ ]*\"[[:alnum:]]*\"/rev = \"$LATEST_SHA\"/g" $DEP_FILEPATH
 
           # ssh git access required for cargo update
           eval "$(ssh-agent -s)"
           ssh-add - <<< '${{ secrets.SSH_GIT_ACCESS_PRIVATE }}'
 
           # Update Cargo lock file, but as little as possible
-          cargo update -p ndc-postgres
+          cargo update -p ndc-postgres@${LATEST_NDC_POSTGRES_VERSION}
 
           # Commit the changes and push the feature branch to origin
           git add .