diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 7b0c265..16cf9db 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -17,6 +17,15 @@ jobs: steps: - uses: actions/checkout@v4 + # The _cosmosvendor/sync_sdk.bash script (via make deps) + # tries to use an existing SDK checkout to speed up the clone. + # Relying on actions/checkout should make that part of the cache, + # so CI ought to run faster. + - uses: actions/checkout@v4 + with: + repository: cosmos/cosmos-sdk + path: ../cosmos-sdk + - name: Set up Go uses: actions/setup-go@v5 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5677ba3..42acede 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,6 +14,15 @@ jobs: steps: - uses: actions/checkout@v4 + # The _cosmosvendor/sync_sdk.bash script (via make deps) + # tries to use an existing SDK checkout to speed up the clone. + # Relying on actions/checkout should make that part of the cache, + # so CI ought to run faster. + - uses: actions/checkout@v4 + with: + repository: cosmos/cosmos-sdk + path: ../cosmos-sdk + - name: Set up Go uses: actions/setup-go@v5 with: diff --git a/_cosmosvendor/sync_sdk.bash b/_cosmosvendor/sync_sdk.bash index 8c4e49d..34a317b 100755 --- a/_cosmosvendor/sync_sdk.bash +++ b/_cosmosvendor/sync_sdk.bash @@ -15,14 +15,14 @@ if ! test -d "$SDK_DIR"; then # where a user may have an existing clone. # 1. GOPATH style, assuming we are in GOPATH/src/github.com/rollchains/gordian/gcosmos/_cosmosvendor # and the other repo is GOPATH/src/github.com/cosmos/cosmos-sdk - # 2. Go module style, where we are in $X/gordian/gcosmos + # 2. Go module style, where we are in $X/gcosmos # and the other repo is in $X/cosmos-sdk # # And --dissociate to ensure that our vendored copy works # even if the referenced repo goes away for whatever reason. git clone \ --reference-if-able ../../../cosmos/cosmos-sdk \ - --reference-if-able ../../cosmos-sdk \ + --reference-if-able ../cosmos-sdk \ --dissociate \ https://github.com/cosmos/cosmos-sdk \ "$SDK_DIR"