Skip to content

Commit 672b919

Browse files
cinterlopercinterloper
committed
Merge remote-tracking branch 'origin/dev/SERVER-216-akash' into dev/SERVER-216
# Conflicts: # .github/packaging/common
2 parents 3cab2b9 + 5ee862e commit 672b919

File tree

2 files changed

+44
-10
lines changed

2 files changed

+44
-10
lines changed

‎.github/packaging/project/install_deps.sh‎

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,39 @@
11
#!/usr/bin/env bash
22
set -x
3-
DEBIAN_12_DEPS="libreadline8 libreadline-dev ruby-rubygems make rpm git snapd curl binutils rsync libssl3 libssl-dev lzma lzma-dev libffi-dev build-essential gcc g++"
4-
DEBIAN_13_DEPS="libreadline8 libreadline-dev ruby-rubygems make rpm git snapd curl binutils rsync libssl3 libssl-dev lzma liblzma-dev libffi-dev libsqlite3-dev build-essential gcc g++ zlib1g-dev libbz2-dev libreadline-dev libncursesw5-dev libnss3-dev uuid-dev tk-dev xz-utils"
5-
UBUNTU_2004_DEPS="libreadline8 libreadline-dev ruby make rpm git snapd curl binutils rsync libssl1.1 libssl-dev lzma lzma-dev libffi-dev build-essential gcc g++"
6-
UBUNTU_2204_DEPS="libreadline8 libreadline-dev ruby-rubygems make rpm git snapd curl binutils rsync libssl3 libssl-dev lzma lzma-dev libffi-dev build-essential gcc g++"
7-
UBUNTU_2404_DEPS="libreadline8 libreadline-dev ruby-rubygems make rpm git snapd curl binutils rsync libssl3 libssl-dev lzma lzma-dev libffi-dev build-essential gcc g++"
8-
EL8_DEPS="ruby rubygems redhat-rpm-config rpm-build make git rsync gcc gcc-c++ make automake zlib zlib-devel libffi-devel openssl-devel bzip2-devel xz-devel xz xz-libs sqlite sqlite-devel sqlite-libs"
9-
EL9_DEPS="ruby rpmdevtools make git rsync gcc g++ make automake zlib zlib-devel libffi-devel openssl-devel bzip2-devel xz-devel xz xz-libs sqlite sqlite-devel sqlite-libs"
10-
EL10_DEPS="ruby rpmdevtools make git rsync gcc g++ make automake zlib zlib-devel libffi-devel openssl-devel bzip2-devel xz-devel xz xz-libs sqlite sqlite-devel sqlite-libs"
11-
AMZN2023_DEPS="readline-devel ruby rpmdevtools make git rsync gcc g++ make automake zlib zlib-devel libffi-devel openssl-devel bzip2-devel xz-devel xz xz-libs sqlite sqlite-devel sqlite-libs"
3+
4+
# Install Rust for building cryptography from source
5+
function install_rust() {
6+
echo "=== Installing Rust for cryptography build ==="
7+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
8+
9+
# Add Rust to PATH for current session
10+
export PATH="$HOME/.cargo/bin:$PATH"
11+
source "$HOME/.cargo/env" || true
12+
13+
# Make Rust available system-wide by symlinking to /usr/local/bin
14+
if [ -f "$HOME/.cargo/bin/rustc" ]; then
15+
ln -sf "$HOME/.cargo/bin/rustc" /usr/local/bin/rustc || true
16+
ln -sf "$HOME/.cargo/bin/cargo" /usr/local/bin/cargo || true
17+
ln -sf "$HOME/.cargo/bin/rustup" /usr/local/bin/rustup || true
18+
fi
19+
20+
# Verify Rust installation
21+
if ! command -v rustc &> /dev/null; then
22+
echo "ERROR: Rust installation failed"
23+
exit 1
24+
fi
25+
echo "Rust version: $(rustc --version)"
26+
}
27+
28+
DEBIAN_12_DEPS="libreadline8 libreadline-dev ruby-rubygems make rpm git snapd curl binutils rsync libssl3 libssl-dev lzma lzma-dev libffi-dev build-essential gcc g++ pkg-config"
29+
DEBIAN_13_DEPS="libreadline8 libreadline-dev ruby-rubygems make rpm git snapd curl binutils rsync libssl3 libssl-dev lzma liblzma-dev libffi-dev libsqlite3-dev build-essential gcc g++ zlib1g-dev libbz2-dev libreadline-dev libncursesw5-dev libnss3-dev uuid-dev tk-dev xz-utils pkg-config"
30+
UBUNTU_2004_DEPS="libreadline8 libreadline-dev ruby make rpm git snapd curl binutils rsync libssl1.1 libssl-dev lzma lzma-dev libffi-dev build-essential gcc g++ pkg-config"
31+
UBUNTU_2204_DEPS="libreadline8 libreadline-dev ruby-rubygems make rpm git snapd curl binutils rsync libssl3 libssl-dev lzma lzma-dev libffi-dev build-essential gcc g++ pkg-config"
32+
UBUNTU_2404_DEPS="libreadline8 libreadline-dev ruby-rubygems make rpm git snapd curl binutils rsync libssl3 libssl-dev lzma lzma-dev libffi-dev build-essential gcc g++ pkg-config"
33+
EL8_DEPS="ruby rubygems redhat-rpm-config rpm-build make git rsync gcc gcc-c++ make automake zlib zlib-devel libffi-devel openssl-devel bzip2-devel xz-devel xz xz-libs sqlite sqlite-devel sqlite-libs pkg-config"
34+
EL9_DEPS="ruby rpmdevtools make git rsync gcc g++ make automake zlib zlib-devel libffi-devel openssl-devel bzip2-devel xz-devel xz xz-libs sqlite sqlite-devel sqlite-libs pkg-config"
35+
EL10_DEPS="ruby rpmdevtools make git rsync gcc g++ make automake zlib zlib-devel libffi-devel openssl-devel bzip2-devel xz-devel xz xz-libs sqlite sqlite-devel sqlite-libs pkg-config"
36+
AMZN2023_DEPS="readline-devel ruby rpmdevtools make git rsync gcc g++ make automake zlib zlib-devel libffi-devel openssl-devel bzip2-devel xz-devel xz xz-libs sqlite sqlite-devel sqlite-libs pkg-config"
1237
function install_deps_debian12() {
1338
apt -y install $DEBIAN_12_DEPS
1439
if [ "$(uname -m)" = "x86_64" ]; then
@@ -23,6 +48,7 @@ function install_deps_debian12() {
2348
fi
2449
/opt/golang/go/bin/go install github.com/asdf-vm/asdf/cmd/[email protected]
2550
install /root/go/bin/asdf /usr/local/bin/asdf
51+
install_rust
2652
asdf plugin add python https://github.com/asdf-community/asdf-python.git
2753
asdf install python 3.10.18
2854
asdf set python 3.10.18
@@ -51,6 +77,7 @@ function install_deps_debian13() {
5177
fi
5278
/opt/golang/go/bin/go install github.com/asdf-vm/asdf/cmd/[email protected]
5379
install /root/go/bin/asdf /usr/local/bin/asdf
80+
install_rust
5481
asdf plugin add python https://github.com/asdf-community/asdf-python.git
5582
asdf install python 3.10.18
5683
asdf set python 3.10.18
@@ -81,6 +108,7 @@ function install_deps_ubuntu20.04() {
81108
fi
82109
/opt/golang/go/bin/go install github.com/asdf-vm/asdf/cmd/[email protected]
83110
install /root/go/bin/asdf /usr/local/bin/asdf
111+
install_rust
84112
asdf plugin add python https://github.com/asdf-community/asdf-python.git
85113
asdf install python 3.10.18
86114
asdf set python 3.10.18
@@ -109,6 +137,7 @@ function install_deps_ubuntu22.04() {
109137
fi
110138
/opt/golang/go/bin/go install github.com/asdf-vm/asdf/cmd/[email protected]
111139
install /root/go/bin/asdf /usr/local/bin/asdf
140+
install_rust
112141
asdf plugin add python https://github.com/asdf-community/asdf-python.git
113142
asdf install python 3.10.18
114143
asdf set python 3.10.18
@@ -138,6 +167,7 @@ function install_deps_ubuntu24.04() {
138167

139168
/opt/golang/go/bin/go install github.com/asdf-vm/asdf/cmd/[email protected]
140169
install /root/go/bin/asdf /usr/local/bin/asdf
170+
install_rust
141171
asdf plugin add python https://github.com/asdf-community/asdf-python.git
142172
asdf install python 3.10.18
143173
asdf set python 3.10.18
@@ -168,6 +198,7 @@ function install_deps_el8() {
168198
fi
169199
/opt/golang/go/bin/go install github.com/asdf-vm/asdf/cmd/[email protected]
170200
install /root/go/bin/asdf /usr/local/bin/asdf
201+
install_rust
171202
asdf plugin add python https://github.com/asdf-community/asdf-python.git
172203
asdf install python 3.10.18
173204
asdf set python 3.10.18
@@ -199,6 +230,7 @@ function install_deps_el9() {
199230
fi
200231
/opt/golang/go/bin/go install github.com/asdf-vm/asdf/cmd/[email protected]
201232
install /root/go/bin/asdf /usr/local/bin/asdf
233+
install_rust
202234
asdf plugin add python https://github.com/asdf-community/asdf-python.git
203235
asdf install python 3.10.18
204236
asdf set python 3.10.18
@@ -228,6 +260,7 @@ function install_deps_el10() {
228260
fi
229261
/opt/golang/go/bin/go install github.com/asdf-vm/asdf/cmd/[email protected]
230262
install /root/go/bin/asdf /usr/local/bin/asdf
263+
install_rust
231264
asdf plugin add python https://github.com/asdf-community/asdf-python.git
232265
asdf install python 3.10.18
233266
asdf set python 3.10.18
@@ -256,6 +289,7 @@ function install_deps_amzn2023() {
256289
fi
257290
/opt/golang/go/bin/go install github.com/asdf-vm/asdf/cmd/[email protected]
258291
install /root/go/bin/asdf /usr/local/bin/asdf
292+
install_rust
259293
asdf plugin add python https://github.com/asdf-community/asdf-python.git
260294
asdf install python 3.10.18
261295
asdf set python 3.10.18

‎makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ one-dir: init
7070

7171
.PHONY: init
7272
init:
73-
pipenv install --dev
73+
PATH="$$HOME/.cargo/bin:/usr/local/bin:$$PATH" PIP_NO_BINARY=cryptography pipenv install --dev
7474
# pipenv check
7575
pipenv graph
7676

0 commit comments

Comments
 (0)