Skip to content

Commit 2448773

Browse files
committed
Merge remote-tracking branch 'origin/master' into jszwedko/fix-python-macos-install
2 parents 6708c57 + ff6e888 commit 2448773

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

.github/workflows/regression.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ on:
3434
pull_request:
3535

3636
concurrency:
37-
group: ${{ github.workflow }}-${{ github.event.merge_group.head_sha || github.sha }}
37+
group: ${{ github.workflow }}-${{ github.event.comment.html_url || github.event.merge_group.head_sha || github.sha }}
3838
cancel-in-progress: true
3939

4040
env:

Cargo.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ ntapi = { git = "https://github.com/MSxDOS/ntapi.git", rev = "24fc1e47677fc9f6e3
391391
# The current `openssl-sys` crate will vendor the OpenSSL sources via
392392
# `openssl-src` at version 1.1.1*, but we want version 3.1.*. Bring in forked
393393
# version of that crate with the appropriate dependency patched in.
394-
openssl-sys = { git = "https://github.com/vectordotdev/rust-openssl", tag = "openssl-sys-v0.9.91_3.0.0" }
394+
openssl-sys = { git = "https://github.com/vectordotdev/rust-openssl", tag = "openssl-sys-v0.9.92_3.0.0" }
395395
openssl-src = { git = "https://github.com/vectordotdev/openssl-src-rs", tag = "release-300-force-engine_3.1.2" }
396396

397397

scripts/environment/bootstrap-ubuntu-20.04.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,13 @@ apt install --yes \
2323
apt upgrade --yes
2424

2525
# Deps
26-
apt install --yes \
26+
apt install --yes --no-install-recommends \
2727
awscli \
2828
build-essential \
2929
ca-certificates \
3030
cmake \
3131
cmark-gfm \
3232
curl \
33-
docker-compose \
3433
gawk \
3534
gnupg2 \
3635
gnupg-agent \

0 commit comments

Comments
 (0)