Skip to content

Commit 9e80f9b

Browse files
authored
Merge branch 'master' into dependabot/github_actions/aquasecurity/setup-trivy-0.2.5
2 parents 4210ff4 + 026daf8 commit 9e80f9b

15 files changed

Lines changed: 105 additions & 88 deletions

.github/workflows/audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
env:
2020
TAG: latest
2121
steps:
22-
- uses: actions/checkout@v5
22+
- uses: actions/checkout@v6
2323
- name: Manual Trivy Setup
2424
uses: aquasecurity/setup-trivy@v0.3.1
2525
with:

.github/workflows/release_image.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
runs-on: ubuntu-latest
4343

4444
steps:
45-
- uses: actions/checkout@v5
45+
- uses: actions/checkout@v6
4646
with:
4747
fetch-depth: 0
4848

@@ -51,7 +51,7 @@ jobs:
5151

5252
- name: Log into ghcr registry
5353
if: github.event_name != 'pull_request'
54-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
54+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
5555
with:
5656
registry: ghcr.io
5757
username: ${{ github.actor }}

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
test:
1414
runs-on: "ubuntu-latest"
1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v6
1717
- uses: ruby/setup-ruby@v1
1818
- run: "bundle install"
1919
- run: "bundle exec rake"

.github/workflows/update_gems.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535

3636
steps:
37-
- uses: actions/checkout@v5
37+
- uses: actions/checkout@v6
3838

3939
- uses: ruby/setup-ruby@v1
4040
with:

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3
1+
3.4.9

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
<a name="2.138.0-pactbroker2.119.0"></a>
2+
### 2.138.0-pactbroker2.119.0 (2026-04-17)
3+
4+
#### Features
5+
6+
* **deps**
7+
* update pact_broker gem to version 2.119.0 ([776961d](/../../commit/776961d))
8+
9+
#### Bug Fixes
10+
11+
* Update Trivy setup action version to v0.2.6 ([22c2f06](/../../commit/22c2f06))
12+
* pin postgres to version 17 to avoid data directory incompatibility ([dd1a22d](/../../commit/dd1a22d))
13+
* update pact-broker image to latest version with ARM64 support ([8571152](/../../commit/8571152))
14+
15+
* **deps**
16+
* bundle update ([7db8e86](/../../commit/7db8e86))
17+
118
<a name="2.137.0-pactbroker2.118.0"></a>
219
### 2.137.0-pactbroker2.118.0 (2026-01-06)
320

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
FROM ruby:3.3.10-alpine3.23 AS base
1+
FROM ruby:3.4.9-alpine3.23 AS base
22

33
# 1. Install target specfic dependencies
44
# - gcompat required for arm/arm64 (otherwise nokogiri breaks when viewing network graph)
55
# - https://github.com/sparklemotion/nokogiri/issues/2414
66
# 2. Supercronic - setup sha1sum for each supported architecture
77
FROM base AS base-amd64
8-
ENV SUPERCRONIC_SHA1SUM=f70ad28d0d739a96dc9e2087ae370c257e79b8d7
8+
ENV SUPERCRONIC_SHA1SUM=f97b92132b61a8f827c3faf67106dc0e4467ccf2
99
FROM base AS base-arm64
10-
ENV SUPERCRONIC_SHA1SUM=44e10e33e8d98b1d1522f6719f15fb9469786ff0
10+
ENV SUPERCRONIC_SHA1SUM=5c6266786c2813d6f8a99965d84452faae42b483
1111
RUN apk add --update --no-cache gcompat
1212
FROM base AS base-arm
13-
ENV SUPERCRONIC_SHA1SUM=d1e9c90160c92201233daf164088bd861b4b39a4
13+
ENV SUPERCRONIC_SHA1SUM=9d222afc7875bff33bb3623dd88b390f51d9d81e
1414
RUN apk add --update --no-cache gcompat
1515

1616
# Supercronic - use base-$TARGETARCH to select correct base image SUPERCRONIC_SHA1SUM
@@ -19,7 +19,7 @@ FROM base-$TARGETARCH AS pb-dev
1919

2020
# Install Supercronic
2121
ARG TARGETARCH
22-
ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.2.41/supercronic-linux-${TARGETARCH} \
22+
ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.2.43/supercronic-linux-${TARGETARCH} \
2323
SUPERCRONIC=supercronic-linux-${TARGETARCH}
2424
RUN wget "$SUPERCRONIC_URL" \
2525
&& echo "${SUPERCRONIC_SHA1SUM} ${SUPERCRONIC}" | sha1sum -c - \

Dockerfile-bundle-base

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.3.10-alpine3.23
1+
FROM ruby:3.4.9-alpine3.23
22

33
# Installation path
44
ENV HOME=/pact_broker

Dockerfile-package-base

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.3.10-alpine3.23
1+
FROM ruby:3.4.9-alpine3.23
22

33
# Installation path
44
ENV HOME=/app

Gemfile.lock

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ GIT
1515
GEM
1616
remote: https://rubygems.org/
1717
specs:
18-
amazing_print (1.8.1)
19-
anyway_config (2.7.2)
18+
amazing_print (2.0.0)
19+
anyway_config (2.8.0)
2020
ruby-next-core (~> 1.0)
2121
as-notifications (1.0.2)
2222
base64 (0.3.0)
23-
bigdecimal (3.3.1)
24-
concurrent-ruby (1.3.5)
23+
bigdecimal (4.0.1)
24+
concurrent-ruby (1.3.6)
2525
crass (1.0.6)
2626
csv (3.3.5)
27-
date (3.5.0)
27+
date (3.5.1)
2828
declarative (0.0.20)
2929
diff-lcs (1.6.2)
3030
disposable (0.6.3)
@@ -33,27 +33,27 @@ GEM
3333
dry-configurable (1.3.0)
3434
dry-core (~> 1.1)
3535
zeitwerk (~> 2.6)
36-
dry-core (1.1.0)
36+
dry-core (1.2.0)
3737
concurrent-ruby (~> 1.0)
3838
logger
3939
zeitwerk (~> 2.6)
40-
dry-inflector (1.2.0)
40+
dry-inflector (1.3.1)
4141
dry-initializer (3.2.0)
4242
dry-logic (1.6.0)
4343
bigdecimal
4444
concurrent-ruby (~> 1.0)
4545
dry-core (~> 1.1)
4646
zeitwerk (~> 2.6)
47-
dry-schema (1.14.1)
47+
dry-schema (1.16.0)
4848
concurrent-ruby (~> 1.0)
4949
dry-configurable (~> 1.0, >= 1.0.1)
5050
dry-core (~> 1.1)
5151
dry-initializer (~> 3.2)
52-
dry-logic (~> 1.5)
53-
dry-types (~> 1.8)
52+
dry-logic (~> 1.6)
53+
dry-types (~> 1.9, >= 1.9.1)
5454
zeitwerk (~> 2.6)
55-
dry-types (1.8.3)
56-
bigdecimal (~> 3.0)
55+
dry-types (1.9.1)
56+
bigdecimal (>= 3.0)
5757
concurrent-ruby (~> 1.0)
5858
dry-core (~> 1.0)
5959
dry-inflector (~> 1.0)
@@ -70,34 +70,35 @@ GEM
7070
haml (5.2.2)
7171
temple (>= 0.8.0)
7272
tilt
73-
i18n (1.14.7)
73+
i18n (1.14.8)
7474
concurrent-ruby (~> 1.0)
7575
json (2.12.2)
7676
jsonpath (1.1.5)
7777
multi_json
7878
logger (1.7.0)
7979
mini_portile2 (2.8.9)
8080
moments (0.3.0)
81-
multi_json (1.17.0)
81+
multi_json (1.19.1)
8282
mustermann (3.0.4)
8383
ruby2_keywords (~> 0.0.1)
8484
mutex_m (0.3.0)
8585
mysql2 (0.5.7)
8686
bigdecimal
8787
nio4r (2.7.5)
88-
nokogiri (1.18.10)
88+
nokogiri (1.19.1)
8989
mini_portile2 (~> 2.8.2)
9090
racc (~> 1.4)
9191
ostruct (0.6.3)
92-
pact-support (1.21.4)
93-
amazing_print (~> 1.8)
92+
pact-support (1.21.6)
93+
amazing_print (~> 2.0)
9494
diff-lcs (~> 1.6)
9595
expgen (~> 0.1)
9696
json (~> 2.12.2)
9797
jsonpath (~> 1.0)
98+
logger (< 2.0)
9899
rainbow (~> 3.1.1)
99100
string_pattern (~> 2.0)
100-
pact_broker (2.117.1)
101+
pact_broker (2.118.0)
101102
anyway_config (~> 2.1)
102103
csv (~> 3.0)
103104
dry-validation (~> 1.8)
@@ -122,21 +123,21 @@ GEM
122123
table_print (~> 1.5)
123124
webmachine (>= 2.0.0.beta, < 3.0)
124125
wisper (~> 2.0)
125-
padrino-core (0.16.0.pre3)
126-
padrino-support (= 0.16.0.pre3)
126+
padrino-core (0.16.0)
127+
padrino-support (= 0.16.0)
127128
rackup (~> 2.1)
128129
sinatra (~> 4)
129130
thor (~> 1.0)
130-
padrino-support (0.16.0.pre3)
131+
padrino-support (0.16.0)
131132
parslet (2.0.0)
132-
pg (1.6.2)
133-
psych (5.2.6)
133+
pg (1.6.3)
134+
psych (5.3.1)
134135
date
135136
stringio
136-
puma (7.1.0)
137+
puma (7.2.0)
137138
nio4r (~> 2.0)
138139
racc (1.8.1)
139-
rack (3.2.4)
140+
rack (3.2.5)
140141
rack-protection (4.2.1)
141142
base64 (>= 0.1.0)
142143
logger (>= 1.6.0)
@@ -146,7 +147,7 @@ GEM
146147
rack (>= 3.0.0)
147148
rack-test (2.2.0)
148149
rack (>= 1.3)
149-
rackup (2.2.1)
150+
rackup (2.3.1)
150151
rack (>= 3)
151152
rainbow (3.1.1)
152153
rake (13.3.1)
@@ -176,19 +177,19 @@ GEM
176177
rspec-its (2.0.0)
177178
rspec-core (>= 3.13.0)
178179
rspec-expectations (>= 3.13.0)
179-
rspec-mocks (3.13.7)
180+
rspec-mocks (3.13.8)
180181
diff-lcs (>= 1.2.0, < 2.0)
181182
rspec-support (~> 3.13.0)
182-
rspec-support (3.13.6)
183-
ruby-next-core (1.1.2)
183+
rspec-support (3.13.7)
184+
ruby-next-core (1.2.0)
184185
ruby2_keywords (0.0.5)
185186
sanitize (6.1.3)
186187
crass (~> 1.0.2)
187188
nokogiri (>= 1.12.0)
188189
semantic_logger (4.17.0)
189190
concurrent-ruby (~> 1.0)
190191
semver2 (3.4.2)
191-
sequel (5.98.0)
192+
sequel (5.102.0)
192193
bigdecimal
193194
sinatra (4.2.1)
194195
logger (>= 1.6.0)
@@ -197,17 +198,17 @@ GEM
197198
rack-protection (= 4.2.1)
198199
rack-session (>= 2.0.0, < 3)
199200
tilt (~> 2.0)
200-
sqlite3 (2.7.4)
201+
sqlite3 (2.9.1)
201202
mini_portile2 (~> 2.8.0)
202-
string_pattern (2.3.0)
203+
string_pattern (2.4.0)
203204
regexp_parser (~> 2.5, >= 2.5.0)
204-
stringio (3.1.7)
205-
sucker_punch (3.2.0)
205+
stringio (3.2.0)
206+
sucker_punch (3.3.0)
206207
concurrent-ruby (~> 1.0)
207208
table_print (1.5.7)
208209
temple (0.10.4)
209-
thor (1.4.0)
210-
tilt (2.6.1)
210+
thor (1.5.0)
211+
tilt (2.7.0)
211212
trailblazer-option (0.1.2)
212213
uber (0.1.0)
213214
webmachine (2.0.1)
@@ -216,7 +217,7 @@ GEM
216217
i18n (>= 0.4.0)
217218
multi_json
218219
wisper (2.0.1)
219-
zeitwerk (2.7.3)
220+
zeitwerk (2.7.5)
220221

221222
PLATFORMS
222223
ruby

0 commit comments

Comments
 (0)