Skip to content

Commit c30fc7f

Browse files
committed
Merge remote-tracking branch 'origin/main' into integration-tests
2 parents 5dd850d + bec043b commit c30fc7f

File tree

71 files changed

+8345
-2646
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+8345
-2646
lines changed

.github/workflows/bot-cache.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
steps:
2323
- name: run cache
2424
if: success() && ! env.CI_SKIP
25-
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
25+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
2626
with:
2727
path: cf-graph.tar.zstd
2828
key: cf-graph-tzstd-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.version }}

.github/workflows/keepalive.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
echo "NEXT=${NEXT}" >> "$GITHUB_OUTPUT"
4949
5050
- name: log into ghcr.io
51-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
51+
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
5252
if: ${{ ! env.CI_SKIP }}
5353
with:
5454
registry: ${{ env.REGISTRY }}
@@ -68,7 +68,7 @@ jobs:
6868
type=raw,value=latest
6969
7070
- name: build and push image
71-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
71+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
7272
if: ${{ ! env.CI_SKIP }}
7373
with:
7474
context: .

.github/workflows/tests-reusable.yml

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
5656
- name: download lockfile if it is an artifact
5757
if: ${{ inputs.lockfile-is-artifact }}
58-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
58+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
5959
with:
6060
name: ${{ inputs.lockfile }}
6161
path: input-lockfile
@@ -110,7 +110,7 @@ jobs:
110110
if: ${{ ! env.CI_SKIP }}
111111

112112
- name: build docker image
113-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
113+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
114114
if: ${{ ! env.CI_SKIP }}
115115
with:
116116
context: .
@@ -119,7 +119,7 @@ jobs:
119119
tags: ${{ env.IMAGE_NAME }}:test
120120

121121
- name: restore test durations
122-
uses: actions/cache/restore@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
122+
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
123123
if: ${{ ! env.CI_SKIP }}
124124
with:
125125
path: .test_durations
@@ -157,15 +157,15 @@ jobs:
157157
BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
158158

159159
- name: upload test durations
160-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
160+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
161161
if: ${{ ! env.CI_SKIP }}
162162
with:
163163
name: test-durations-${{ matrix.group }}
164164
path: .test_durations.${{ matrix.group }}
165165
include-hidden-files: true
166166

167167
- name: upload coverage
168-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
168+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
169169
if: ${{ ! env.CI_SKIP }}
170170
with:
171171
name: coverage-${{ matrix.group }}
@@ -201,7 +201,7 @@ jobs:
201201
202202
- name: download lockfile if it is an artifact
203203
if: ${{ inputs.lockfile-is-artifact }}
204-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
204+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
205205
with:
206206
name: ${{ inputs.lockfile }}
207207
path: input-lockfile
@@ -265,7 +265,7 @@ jobs:
265265
MONGODB_CONNECTION_STRING: "mongodb://127.0.0.1:27017/?directConnection=true&serverSelectionTimeoutMS=2000"
266266

267267
- name: restore test durations
268-
uses: actions/cache/restore@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
268+
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
269269
if: ${{ ! env.CI_SKIP }}
270270
with:
271271
path: .test_durations
@@ -305,15 +305,15 @@ jobs:
305305
BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
306306

307307
- name: upload test durations
308-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
308+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
309309
if: ${{ ! env.CI_SKIP }}
310310
with:
311311
name: test-durations-mongodb
312312
path: .test_durations.mongodb
313313
include-hidden-files: true
314314

315315
- name: upload coverage
316-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
316+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
317317
if: ${{ ! env.CI_SKIP }}
318318
with:
319319
name: coverage-mongodb
@@ -342,7 +342,7 @@ jobs:
342342
343343
- name: download lockfile if it is an artifact
344344
if: ${{ inputs.lockfile-is-artifact }}
345-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
345+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
346346
with:
347347
name: ${{ inputs.lockfile }}
348348
path: input-lockfile
@@ -363,7 +363,7 @@ jobs:
363363
python autotick-bot/stop_me_if_needed.py
364364
365365
- name: download coverage artifacts
366-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
366+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
367367
if: ${{ ! env.CI_SKIP }}
368368
with:
369369
pattern: coverage-*
@@ -375,13 +375,13 @@ jobs:
375375
coverage xml
376376
377377
- name: upload codecov
378-
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.1.8
378+
uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.1.8
379379
if: ${{ ! env.CI_SKIP }}
380380
with:
381381
token: ${{ secrets.CODECOV_TOKEN }}
382382

383383
- name: cache test durations
384-
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
384+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
385385
if: ${{ ! env.CI_SKIP }}
386386
with:
387387
path: .test_durations
@@ -391,7 +391,7 @@ jobs:
391391
test-durations-
392392
393393
- name: download test duration artifacts
394-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
394+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
395395
if: ${{ ! env.CI_SKIP }}
396396
with:
397397
pattern: test-durations-*
@@ -403,9 +403,24 @@ jobs:
403403
jq 'reduce inputs as $i (.; . + $i)' test-durations-*/.test_durations.* > .test_durations
404404
405405
- name: upload test durations
406-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
406+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
407407
if: ${{ ! env.CI_SKIP }}
408408
with:
409409
name: test-durations
410410
path: .test_durations
411411
include-hidden-files: true
412+
413+
# this little bit follows the same pattern from conda-build
414+
status:
415+
needs:
416+
- tests
417+
- tests-mongodb
418+
- test-coverage-and-durations
419+
if: '!cancelled()'
420+
421+
runs-on: ubuntu-latest
422+
steps:
423+
- name: determine success
424+
uses: re-actors/alls-green@05ac9388f0aebcb5727afa17fcccfecd6f8ec5fe # v1.2.2
425+
with:
426+
jobs: ${{ toJSON(needs) }}

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ repos:
2424
- --py36-plus
2525

2626
- repo: https://github.com/crate-ci/typos
27-
rev: v1.30.0
27+
rev: v1
2828
hooks:
2929
- id: typos
3030
exclude: |
@@ -34,7 +34,7 @@ repos:
3434
)$
3535
3636
- repo: https://github.com/astral-sh/ruff-pre-commit
37-
rev: v0.9.9
37+
rev: v0.11.5
3838
hooks:
3939
- id: ruff
4040
args: [ --fix ]

0 commit comments

Comments
 (0)