Changelog 1.18.10+ent (#22304)

* Changelog sync for v1.18.10+ent

* skip ci on only changelog commit

* ignore github skip changes folders

Author: anandmukul93

.github/scripts/filter_changed_files_go_test.sh

@@ -16,7 +16,7 @@ set -euo pipefail
 files_to_check=$(git diff --name-only "$(git merge-base origin/$SKIP_CHECK_BRANCH HEAD~)"...HEAD)
 
 # Define the directories to check
-skipped_directories=("docs/" "ui/" "website/" "grafana/")
+skipped_directories=("docs/" "ui/" "website/" "grafana/ .github/")
 
 # Loop through the changed files and find directories/files outside the skipped ones
 for file_to_check in "${files_to_check[@]}"; do

.github/workflows/build-distros.yml

@@ -16,13 +16,29 @@ permissions:
 env:
   GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
   GOPRIVATE: github.com/hashicorp # Required for enterprise deps
+  SKIP_CHECK_BRANCH: ${{ github.head_ref || github.ref_name }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
 
 jobs:
+  conditional-skip:
+    runs-on: ubuntu-latest
+    name: Get files changed and conditionally skip CI
+    outputs:
+      skip-ci: ${{ steps.read-files.outputs.skip-ci }}
+    steps:
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        with:
+          fetch-depth: 0
+      - name: Get changed files
+        id: read-files
+        run: ./.github/scripts/filter_changed_files_go_test.sh
   setup:
+    needs:
+      - conditional-skip
+    if: needs.conditional-skip.outputs.skip-ci != 'true'
     name: Setup
     runs-on: ubuntu-latest
     outputs:
@@ -165,14 +181,15 @@ jobs:
   # sure it does not get skipped.
   build-distros-success:
     needs:
+    - conditional-skip
     - setup
     - check-go-mod
     - build-386
     - build-amd64
     - build-arm
     - build-s390x
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
-    if: ${{ always() }}
+    if: needs.conditional-skip.outputs.skip-ci != 'true'
     steps:
       - name: evaluate upstream job results
         run: |

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 1.18.10 Enterprise (March 11, 2025)
+
+SECURITY:
+
+* Update `golang.org/x/crypto` to v0.35.0 to address [GO-2025-3487](https://pkg.go.dev/vuln/GO-2025-3487).
+* Update `golang.org/x/oauth2` to v0.27.0 to address [GO-2025-3488](https://pkg.go.dev/vuln/GO-2025-3488).
+* Update `github.com/go-jose/go-jose/v3` to v3.0.4 to address [GO-2025-3485](https://pkg.go.dev/vuln/GO-2025-3485). [[GH-22207](https://github.com/hashicorp/consul/issues/22207)]
+* Upgrade Go to 1.23.6. [[GH-22204](https://github.com/hashicorp/consul/issues/22204)]
+
+BUG FIXES:
+
+* logging: Fixed compilation error for OS NetBSD. [[GH-22184](https://github.com/hashicorp/consul/issues/22184)
+
 ## 1.18.9 Enterprise (February 20, 2025)
 
 IMPROVEMENTS: