backport of commit 11cf98a

hashicorp · Feb 21, 2025 · 08bd80c · 08bd80c
1 parent 38840e6
commit 08bd80c
Show file tree

Hide file tree

Showing 427 changed files with 3,936 additions and 18,474 deletions.
diff --git a/.changelog/18530.txt b/.changelog/18530.txt
diff --git a/.changelog/24415.txt b/.changelog/24415.txt
diff --git a/.changelog/24601.txt b/.changelog/24601.txt
diff --git a/.changelog/24724.txt b/.changelog/24724.txt
diff --git a/.changelog/24785.txt b/.changelog/24785.txt
diff --git a/.changelog/24909.txt b/.changelog/24909.txt
diff --git a/.changelog/24997.txt b/.changelog/24997.txt
diff --git a/.changelog/25109.txt b/.changelog/25109.txt
diff --git a/.changelog/25173.txt b/.changelog/25173.txt
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -43,7 +43,7 @@ jobs:
         run: git config --global url.'https://${{ env.ELEVATED_GITHUB_TOKEN }}@github.com'.insteadOf 'https://github.com'
       - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
         with:
-          cache: ${{ contains(runner.name, 'Github Actions') }}
+          cache: true
           go-version-file: .go-version
           cache-dependency-path: '**/go.sum'
       - name: Run make check

diff --git a/.github/workflows/test-ui.yml b/.github/workflows/test-ui.yml
@@ -124,7 +124,7 @@ jobs:
         run: node ../scripts/combine-ui-test-results.js
       - name: Upload combined results for comparison
         if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: test-results-${{ github.sha }}
           path: ui/combined-test-results.json

diff --git a/.gitignore b/.gitignore
@@ -137,10 +137,3 @@ tools/missing/missing
 
 # allow security scanner file
 !scan.hcl
-
-# generated variables for upgrade tests
-enos.vars.hcl
-enos/modules/*/*.tfvars
-
-# local license files
-*.hclic