Skip to content

Commit 1ee8943

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into feat-async-elasticsearch
2 parents a359d13 + 4fec742 commit 1ee8943

File tree

6 files changed

+33
-32
lines changed

6 files changed

+33
-32
lines changed

‎.github/dependabot.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ updates:
77
interval: "daily"
88
# Disable all pull requests for dependencies
99
open-pull-requests-limit: 0
10+
1011
- package-ecosystem: "docker"
1112
directory: "/"
1213
schedule:
1314
interval: "daily"
1415
# Disable all pull requests for dependencies
1516
open-pull-requests-limit: 0
17+
1618
- package-ecosystem: "github-actions"
1719
directory: "/"
1820
schedule:
19-
interval: "daily"
20-
# Disable all pull requests for dependencies
21-
open-pull-requests-limit: 0
21+
interval: "weekly"
22+
open-pull-requests-limit: 1

‎.github/workflows/build-ci-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ concurrency:
2323

2424
jobs:
2525
build:
26-
runs-on: ubuntu-22.04
26+
runs-on: ubuntu-24.04
2727

2828
steps:
2929
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.1.1

‎.github/workflows/deploy-python.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121

2222
jobs:
2323
build-linux-py3-legacy:
24-
runs-on: ubuntu-22.04
24+
runs-on: ubuntu-24.04
2525
strategy:
2626
fail-fast: false
2727
matrix:
@@ -56,7 +56,7 @@ jobs:
5656
retention-days: 1
5757

5858
build-linux-py3:
59-
runs-on: ubuntu-22.04
59+
runs-on: ubuntu-24.04
6060
strategy:
6161
fail-fast: false
6262
matrix:
@@ -101,7 +101,7 @@ jobs:
101101
retention-days: 1
102102

103103
build-sdist:
104-
runs-on: ubuntu-22.04
104+
runs-on: ubuntu-24.04
105105
steps:
106106
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.1.1
107107
with:
@@ -133,7 +133,7 @@ jobs:
133133
retention-days: 1
134134

135135
deploy:
136-
runs-on: ubuntu-22.04
136+
runs-on: ubuntu-24.04
137137

138138
needs:
139139
- build-linux-py3-legacy

‎.github/workflows/mega-linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ concurrency:
2121
jobs:
2222
megalinter:
2323
name: MegaLinter
24-
runs-on: ubuntu-22.04
24+
runs-on: ubuntu-24.04
2525
permissions:
2626
# Give the default GITHUB_TOKEN write permission to commit and push, comment issues & post new PR
2727
# Remove the ones you do not need

‎.github/workflows/tests.yml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ concurrency:
3131
jobs:
3232
# Aggregate job that provides a single check for all tests passing
3333
tests:
34-
runs-on: ubuntu-22.04
34+
runs-on: ubuntu-24.04
3535
needs:
3636
- python
3737
- cassandra
@@ -61,7 +61,7 @@ jobs:
6161
# Combine and upload coverage data
6262
coverage:
6363
if: success() || failure() # Does not run on cancelled workflows
64-
runs-on: ubuntu-22.04
64+
runs-on: ubuntu-24.04
6565
needs:
6666
- tests
6767

@@ -123,7 +123,7 @@ jobs:
123123
20,
124124
]
125125

126-
runs-on: ubuntu-22.04
126+
runs-on: ubuntu-24.04
127127
container:
128128
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
129129
options: >-
@@ -172,7 +172,7 @@ jobs:
172172
matrix:
173173
group-number: [1]
174174

175-
runs-on: ubuntu-22.04
175+
runs-on: ubuntu-24.04
176176
container:
177177
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
178178
options: >-
@@ -221,7 +221,7 @@ jobs:
221221
matrix:
222222
group-number: [1]
223223

224-
runs-on: ubuntu-22.04
224+
runs-on: ubuntu-24.04
225225
container:
226226
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
227227
options: >-
@@ -284,7 +284,7 @@ jobs:
284284
matrix:
285285
group-number: [1, 2]
286286

287-
runs-on: ubuntu-22.04
287+
runs-on: ubuntu-24.04
288288
container:
289289
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
290290
options: >-
@@ -348,7 +348,7 @@ jobs:
348348
matrix:
349349
group-number: [1]
350350

351-
runs-on: ubuntu-22.04
351+
runs-on: ubuntu-24.04
352352
container:
353353
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
354354
options: >-
@@ -412,7 +412,7 @@ jobs:
412412
matrix:
413413
group-number: [1]
414414

415-
runs-on: ubuntu-22.04
415+
runs-on: ubuntu-24.04
416416
container:
417417
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
418418
options: >-
@@ -479,7 +479,7 @@ jobs:
479479
matrix:
480480
group-number: [1, 2]
481481

482-
runs-on: ubuntu-22.04
482+
runs-on: ubuntu-24.04
483483
container:
484484
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
485485
options: >-
@@ -546,7 +546,7 @@ jobs:
546546
matrix:
547547
group-number: [1]
548548

549-
runs-on: ubuntu-22.04
549+
runs-on: ubuntu-24.04
550550
container:
551551
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
552552
options: >-
@@ -649,7 +649,7 @@ jobs:
649649
matrix:
650650
group-number: [1, 2]
651651

652-
runs-on: ubuntu-22.04
652+
runs-on: ubuntu-24.04
653653
container:
654654
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
655655
options: >-
@@ -711,7 +711,7 @@ jobs:
711711
matrix:
712712
group-number: [1]
713713

714-
runs-on: ubuntu-22.04
714+
runs-on: ubuntu-24.04
715715
container:
716716
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
717717
options: >-
@@ -775,7 +775,7 @@ jobs:
775775
matrix:
776776
group-number: [1, 2]
777777

778-
runs-on: ubuntu-22.04
778+
runs-on: ubuntu-24.04
779779
container:
780780
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
781781
options: >-
@@ -837,7 +837,7 @@ jobs:
837837
matrix:
838838
group-number: [1]
839839

840-
runs-on: ubuntu-22.04
840+
runs-on: ubuntu-24.04
841841
container:
842842
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
843843
options: >-
@@ -900,7 +900,7 @@ jobs:
900900
matrix:
901901
group-number: [1, 2, 3, 4]
902902

903-
runs-on: ubuntu-22.04
903+
runs-on: ubuntu-24.04
904904
container:
905905
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
906906
options: >-
@@ -974,7 +974,7 @@ jobs:
974974
matrix:
975975
group-number: [1]
976976

977-
runs-on: ubuntu-22.04
977+
runs-on: ubuntu-24.04
978978
container:
979979
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
980980
options: >-
@@ -1036,7 +1036,7 @@ jobs:
10361036
matrix:
10371037
group-number: [1]
10381038

1039-
runs-on: ubuntu-22.04
1039+
runs-on: ubuntu-24.04
10401040
container:
10411041
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
10421042
options: >-
@@ -1098,7 +1098,7 @@ jobs:
10981098
matrix:
10991099
group-number: [1]
11001100

1101-
runs-on: ubuntu-22.04
1101+
runs-on: ubuntu-24.04
11021102
container:
11031103
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
11041104
options: >-
@@ -1165,7 +1165,7 @@ jobs:
11651165
matrix:
11661166
group-number: [1]
11671167

1168-
runs-on: ubuntu-22.04
1168+
runs-on: ubuntu-24.04
11691169
container:
11701170
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
11711171
options: >-
@@ -1229,7 +1229,7 @@ jobs:
12291229
matrix:
12301230
group-number: [1]
12311231

1232-
runs-on: ubuntu-22.04
1232+
runs-on: ubuntu-24.04
12331233
container:
12341234
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
12351235
options: >-
@@ -1294,7 +1294,7 @@ jobs:
12941294
matrix:
12951295
group-number: [1]
12961296

1297-
runs-on: ubuntu-22.04
1297+
runs-on: ubuntu-24.04
12981298
container:
12991299
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
13001300
options: >-
@@ -1363,7 +1363,7 @@ jobs:
13631363
matrix:
13641364
group-number: [1]
13651365

1366-
runs-on: ubuntu-22.04
1366+
runs-on: ubuntu-24.04
13671367
container:
13681368
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
13691369
options: >-

‎.github/workflows/trivy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# Upload Trivy data
2626
trivy:
2727
if: success() || failure() # Does not run on cancelled workflows
28-
runs-on: ubuntu-20.04
28+
runs-on: ubuntu-24.04
2929
steps:
3030
# Git Checkout
3131
- name: Checkout Code

0 commit comments

Comments
 (0)