Skip to content

Commit 128cf50

Browse files
authored
ent to CE changelog sync, version upgrade and ignore workflow runs (#22307)
1 parent b1624d7 commit 128cf50

File tree

4 files changed

+24
-4
lines changed

4 files changed

+24
-4
lines changed

.github/workflows/build-distros.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,14 @@ concurrency:
2222
cancel-in-progress: true
2323

2424
jobs:
25+
conditional-skip:
26+
uses: ./.github/workflows/reusable-conditional-skip.yml
27+
2528
setup:
26-
name: Setup
29+
needs: [ conditional-skip ]
2730
runs-on: ubuntu-latest
31+
name: Setup
32+
if: needs.conditional-skip.outputs.skip-ci != 'true'
2833
outputs:
2934
compute-small: ${{ steps.setup-outputs.outputs.compute-small }}
3035
compute-medium: ${{ steps.setup-outputs.outputs.compute-medium }}
@@ -165,14 +170,15 @@ jobs:
165170
# sure it does not get skipped.
166171
build-distros-success:
167172
needs:
173+
- conditional-skip
168174
- setup
169175
- check-go-mod
170176
- build-386
171177
- build-amd64
172178
- build-arm
173179
- build-s390x
174180
runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
175-
if: ${{ always() }}
181+
if: needs.conditional-skip.outputs.skip-ci != 'true'
176182
steps:
177183
- name: evaluate upstream job results
178184
run: |

.github/workflows/reusable-conditional-skip.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,14 @@ jobs:
4444
# See https://github.com/tj-actions/changed-files/blob/main/README.md#inputs-%EF%B8%8F
4545
# for usage, options, and more details on match syntax.
4646
files: |
47-
.github/workflows/reusable-conditional-skip.yml
47+
.github/**
4848
**.md
4949
docs/**
5050
ui/**
5151
website/**
5252
grafana/**
5353
.changelog/**
54+
version/**
5455
- name: Print changed files
5556
env:
5657
SKIPPABLE_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
## 1.19.7 Enterprise (March 11, 2025)
2+
3+
SECURITY:
4+
5+
* Update `golang.org/x/crypto` to v0.35.0 to address [GO-2025-3487](https://pkg.go.dev/vuln/GO-2025-3487).
6+
* Update `golang.org/x/oauth2` to v0.27.0 to address [GO-2025-3488](https://pkg.go.dev/vuln/GO-2025-3488).
7+
* 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)]
8+
* Upgrade Go to 1.23.6. [[GH-22204](https://github.com/hashicorp/consul/issues/22204)]
9+
10+
BUG FIXES:
11+
12+
* logging: Fixed compilation error for OS NetBSD. [[GH-22184](https://github.com/hashicorp/consul/issues/22184)]
13+
114
## 1.19.6 Enterprise (February 20, 2025)
215

316
IMPROVEMENTS:

version/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.19.7-dev
1+
1.19.8-dev

0 commit comments

Comments
 (0)