Merge branch 'main' into 361_exclude_symlink_directories_skips_other_dirs

metmikel · web-flow · commit 1fabd4fdc443 · 2024-09-13T09:05:57.000+12:00
diff --git a/.changes/2.6.0.md b/.changes/2.6.0.md
@@ -0,0 +1,7 @@
+## 2.6.0 (September 09, 2024)
+
+FEATURES:
+
+* data-source/archive_file: Add support for creating `tar.gz` archive files. ([#277](https://github.com/hashicorp/terraform-provider-archive/issues/277))
+* resource/archive_file: Add support for creating `tar.gz` archive files. ([#277](https://github.com/hashicorp/terraform-provider-archive/issues/277))
+
diff --git a/.changes/unreleased/FEATURES-20240806-142303.yaml b/.changes/unreleased/FEATURES-20240806-142303.yaml
diff --git a/.changes/unreleased/FEATURES-20240806-142529.yaml b/.changes/unreleased/FEATURES-20240806-142529.yaml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -89,7 +89,7 @@ jobs:
           cd .changes
           sed -e "1{/# /d;}" -e "2{/^$/d;}" ${{ needs.changelog-version.outputs.version }}.md > release-notes.txt
 
-      - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
+      - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         with:
           name: release-notes
           path: ./.changes/release-notes.txt
diff --git a/.golangci.yml b/.golangci.yml
@@ -12,6 +12,7 @@ linters:
     - godot
     - gofmt
     - gosimple
+    - govet
     - ineffassign
     - makezero
     - misspell
@@ -22,7 +23,6 @@ linters:
     - unconvert
     - unparam
     - unused
-    - vet
 
 run:
   # Prevent false positive timeouts in CI
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 2.6.0 (September 09, 2024)
+
+FEATURES:
+
+* data-source/archive_file: Add support for creating `tar.gz` archive files. ([#277](https://github.com/hashicorp/terraform-provider-archive/issues/277))
+* resource/archive_file: Add support for creating `tar.gz` archive files. ([#277](https://github.com/hashicorp/terraform-provider-archive/issues/277))
+
 ## 2.5.0 (July 31, 2024)
 
 ENHANCEMENTS:
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ version it implements, and Terraform:
 ## Requirements
 
 * [Terraform](https://www.terraform.io/downloads)
-* [Go](https://go.dev/doc/install) (1.21)
+* [Go](https://go.dev/doc/install) (1.22)
 * [GNU Make](https://www.gnu.org/software/make/)
 * [golangci-lint](https://golangci-lint.run/usage/install/#local-installation) (optional)
 
diff --git a/go.mod b/go.mod
@@ -1,8 +1,6 @@
 module github.com/hashicorp/terraform-provider-archive
 
-go 1.21
-
-toolchain go1.21.3
+go 1.22.7
 
 require (
 	github.com/bmatcuk/doublestar/v4 v4.6.1
diff --git a/tools/go.mod b/tools/go.mod
@@ -1,6 +1,6 @@
 module tools
 
-go 1.21
+go 1.22.7
 
 require (
 	github.com/hashicorp/copywrite v0.19.0
