Allow root-level go.mod for setup-go caching (#1226)

It is valid (and [preferable](https://go.dev/wiki/Modules#should-i-have-multiple-modules-in-a-single-repository)) to have a root-level `go.mod`. If one is present we should use it as a cache key for setup-go. Additionally since there is some talk of moving the SDK's module down a level we might as well handle that case gracefully as well, even if we're not doing it at the moment. (I would prefer to use `**/*.sum`, but we don't want Go examples to bust the cache.)
pulumi · Dec 13, 2024 · a5f44c8 · a5f44c8
1 parent 5f2cfe4
commit a5f44c8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/provider-ci/internal/pkg/templates/provider/.github/actions/setup-tools/action.yml b/provider-ci/internal/pkg/templates/provider/.github/actions/setup-tools/action.yml
@@ -32,7 +32,9 @@ runs:
         cache-dependency-path: |
           provider/*.sum
           upstream/*.sum
+          sdk/go/*.sum
           sdk/*.sum
+          *.sum
         # TODO(https://github.com/actions/setup-go/issues/316): Restore but don't save the cache.
         cache: ${{ inputs.cache-go }}
 

diff --git a/provider-ci/test-providers/acme/.github/actions/setup-tools/action.yml b/provider-ci/test-providers/acme/.github/actions/setup-tools/action.yml
@@ -32,7 +32,9 @@ runs:
         cache-dependency-path: |
           provider/*.sum
           upstream/*.sum
+          sdk/go/*.sum
           sdk/*.sum
+          *.sum
         # TODO(https://github.com/actions/setup-go/issues/316): Restore but don't save the cache.
         cache: ${{ inputs.cache-go }}
 

diff --git a/provider-ci/test-providers/aws/.github/actions/setup-tools/action.yml b/provider-ci/test-providers/aws/.github/actions/setup-tools/action.yml
@@ -32,7 +32,9 @@ runs:
         cache-dependency-path: |
           provider/*.sum
           upstream/*.sum
+          sdk/go/*.sum
           sdk/*.sum
+          *.sum
         # TODO(https://github.com/actions/setup-go/issues/316): Restore but don't save the cache.
         cache: ${{ inputs.cache-go }}
 

diff --git a/provider-ci/test-providers/cloudflare/.github/actions/setup-tools/action.yml b/provider-ci/test-providers/cloudflare/.github/actions/setup-tools/action.yml
@@ -32,7 +32,9 @@ runs:
         cache-dependency-path: |
           provider/*.sum
           upstream/*.sum
+          sdk/go/*.sum
           sdk/*.sum
+          *.sum
         # TODO(https://github.com/actions/setup-go/issues/316): Restore but don't save the cache.
         cache: ${{ inputs.cache-go }}
 

diff --git a/provider-ci/test-providers/docker/.github/actions/setup-tools/action.yml b/provider-ci/test-providers/docker/.github/actions/setup-tools/action.yml
@@ -32,7 +32,9 @@ runs:
         cache-dependency-path: |
           provider/*.sum
           upstream/*.sum
+          sdk/go/*.sum
           sdk/*.sum
+          *.sum
         # TODO(https://github.com/actions/setup-go/issues/316): Restore but don't save the cache.
         cache: ${{ inputs.cache-go }}