Skip to content

Commit c7d5833

Browse files
tdyastdyas
authored
Merge branch 'main' into dependabot/cargo/src/rust/engine/rustls-pki-types-1.11.0
2 parents a89cda8 + dc859a4 commit c7d5833

File tree

584 files changed

+2880
-2181
lines changed

Some content is hidden

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

584 files changed

+2880
-2181
lines changed

‎.github/dependabot.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,9 @@ updates:
1212
time: "03:00"
1313
timezone: "US/Pacific"
1414
reviewers:
15-
- stuhood
15+
- benjyw
16+
- cburroughs
17+
- huonw
18+
- sureshjoshi
19+
- tdyas
20+
- tgolsson

‎.github/workflows/audit.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
with:
1414
fetch-depth: 10
1515
- name: Cargo audit (for security vulnerabilities)
16-
run: './cargo install --version 0.17.5 cargo-audit
16+
run: './cargo install cargo-audit --locked
1717
1818
./cargo audit --ignore RUSTSEC-2020-0128
1919

‎.github/workflows/release.yaml

+8-13
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ jobs:
100100
echo "PEX_FILENAME=$PEX_FILENAME" | tee -a "$GITHUB_ENV"
101101
102102
'
103-
- continue-on-error: true
104-
if: needs.release_info.outputs.is-release == 'true'
103+
- if: needs.release_info.outputs.is-release == 'true'
105104
name: Attest the Pants Pex artifact
106105
uses: actions/attest-build-provenance@v2
107106
with:
@@ -214,8 +213,7 @@ jobs:
214213
echo "PEX_FILENAME=$PEX_FILENAME" | tee -a "$GITHUB_ENV"
215214
216215
'
217-
- continue-on-error: true
218-
if: needs.release_info.outputs.is-release == 'true'
216+
- if: needs.release_info.outputs.is-release == 'true'
219217
name: Attest the Pants Pex artifact
220218
uses: actions/attest-build-provenance@v2
221219
with:
@@ -231,8 +229,7 @@ jobs:
231229
\ }}\" \\\n -H \"Content-Type: application/octet-stream\" \\\n \"${{\
232230
\ needs.release_info.outputs.release-asset-upload-url }}?name=$(basename $WHL)\"\
233231
\ \\\n --data-binary \"@$WHL\";\n"
234-
- continue-on-error: true
235-
if: needs.release_info.outputs.is-release == 'true'
232+
- if: needs.release_info.outputs.is-release == 'true'
236233
name: Attest the pantsbuild.pants.testutil wheel
237234
uses: actions/attest-build-provenance@v2
238235
with:
@@ -294,7 +291,7 @@ jobs:
294291
with:
295292
key: macOS13-x86_64-rustup-${{ hashFiles('src/rust/engine/rust-toolchain')
296293
}}-v2
297-
path: '~/.rustup/toolchains/1.84.1-*
294+
path: '~/.rustup/toolchains/1.85.0-*
298295
299296
~/.rustup/update-hashes
300297
@@ -357,8 +354,7 @@ jobs:
357354
echo "PEX_FILENAME=$PEX_FILENAME" | tee -a "$GITHUB_ENV"
358355
359356
'
360-
- continue-on-error: true
361-
if: needs.release_info.outputs.is-release == 'true'
357+
- if: needs.release_info.outputs.is-release == 'true'
362358
name: Attest the Pants Pex artifact
363359
uses: actions/attest-build-provenance@v2
364360
with:
@@ -420,7 +416,7 @@ jobs:
420416
with:
421417
key: macOS14-ARM64-rustup-${{ hashFiles('src/rust/engine/rust-toolchain')
422418
}}-v2
423-
path: '~/.rustup/toolchains/1.84.1-*
419+
path: '~/.rustup/toolchains/1.85.0-*
424420
425421
~/.rustup/update-hashes
426422
@@ -483,8 +479,7 @@ jobs:
483479
echo "PEX_FILENAME=$PEX_FILENAME" | tee -a "$GITHUB_ENV"
484480
485481
'
486-
- continue-on-error: true
487-
if: needs.release_info.outputs.is-release == 'true'
482+
- if: needs.release_info.outputs.is-release == 'true'
488483
name: Attest the Pants Pex artifact
489484
uses: actions/attest-build-provenance@v2
490485
with:
@@ -547,7 +542,7 @@ jobs:
547542
uses: actions/cache@v4
548543
with:
549544
key: Linux-x86_64-rustup-${{ hashFiles('src/rust/engine/rust-toolchain') }}-v2
550-
path: '~/.rustup/toolchains/1.84.1-*
545+
path: '~/.rustup/toolchains/1.85.0-*
551546
552547
~/.rustup/update-hashes
553548

‎.github/workflows/test.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
uses: actions/cache@v4
4141
with:
4242
key: Linux-ARM64-rustup-${{ hashFiles('src/rust/engine/rust-toolchain') }}-v2
43-
path: '~/.rustup/toolchains/1.84.1-*
43+
path: '~/.rustup/toolchains/1.85.0-*
4444
4545
~/.rustup/update-hashes
4646
@@ -145,7 +145,7 @@ jobs:
145145
uses: actions/cache@v4
146146
with:
147147
key: Linux-x86_64-rustup-${{ hashFiles('src/rust/engine/rust-toolchain') }}-v2
148-
path: '~/.rustup/toolchains/1.84.1-*
148+
path: '~/.rustup/toolchains/1.85.0-*
149149
150150
~/.rustup/update-hashes
151151
@@ -260,7 +260,7 @@ jobs:
260260
uses: actions/cache@v4
261261
with:
262262
key: macOS13-x86_64-rustup-${{ hashFiles('src/rust/engine/rust-toolchain') }}-v2
263-
path: '~/.rustup/toolchains/1.84.1-*
263+
path: '~/.rustup/toolchains/1.85.0-*
264264
265265
~/.rustup/update-hashes
266266
@@ -520,7 +520,7 @@ jobs:
520520
uses: actions/cache@v4
521521
with:
522522
key: macOS13-x86_64-rustup-${{ hashFiles('src/rust/engine/rust-toolchain') }}-v2
523-
path: '~/.rustup/toolchains/1.84.1-*
523+
path: '~/.rustup/toolchains/1.85.0-*
524524
525525
~/.rustup/update-hashes
526526
@@ -606,7 +606,7 @@ jobs:
606606
uses: actions/cache@v4
607607
with:
608608
key: macOS14-ARM64-rustup-${{ hashFiles('src/rust/engine/rust-toolchain') }}-v2
609-
path: '~/.rustup/toolchains/1.84.1-*
609+
path: '~/.rustup/toolchains/1.85.0-*
610610
611611
~/.rustup/update-hashes
612612

‎3rdparty/python/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ freezegun==1.2.1
1111
ijson==3.2.3
1212
libcst==1.4.0
1313
packaging==21.3
14-
pex==2.33.0
14+
pex==2.33.1
1515
psutil==5.9.8
1616
# This should be compatible with pytest.py, although it can be looser so that we don't
1717
# over-constrain pantsbuild.pants.testutil

0 commit comments

Comments
 (0)