Skip to content

Commit e7002df

Browse files
authored
Streamline and update setup-ci.sh (#7956)
1 parent 575adee commit e7002df

1 file changed

Lines changed: 23 additions & 26 deletions

File tree

scripts/setup-ci.sh

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -64,28 +64,29 @@ install_build_dependencies() {
6464
libarrow-devel \
6565
parquet-libs-devel \
6666
doxygen \
67-
clang-tools-extra-devel
67+
clang-tools-extra-devel \
68+
rust
6869
}
6970

7071
install_test_dependencies() {
71-
{
72+
local packages=(
7273
# To run standard tests
73-
tdnf --snapshottime=$SOURCE_DATE_EPOCH -y install \
74-
lldb \
75-
expect \
76-
npm \
77-
jq &&
74+
lldb
75+
expect
76+
npm
77+
jq
7878
# Extra-dependency for CDDL schema checker
79-
tdnf --snapshottime=$SOURCE_DATE_EPOCH -y install rubygems &&
80-
gem install cddl &&
79+
rubygems
8180
# Release (extended) tests
82-
tdnf --snapshottime=$SOURCE_DATE_EPOCH -y install procps &&
81+
procps
8382
# protocoltest
84-
tdnf --snapshottime=$SOURCE_DATE_EPOCH install -y bind-utils &&
83+
bind-utils
8584
# partitions test
86-
tdnf --snapshottime=$SOURCE_DATE_EPOCH -y install iptables &&
87-
tdnf --snapshottime=$SOURCE_DATE_EPOCH -y install strace
88-
}
85+
iptables
86+
strace
87+
)
88+
tdnf --snapshottime=$SOURCE_DATE_EPOCH -y install "${packages[@]}" &&
89+
gem install cddl
8990
}
9091

9192
install_h2spec() {
@@ -101,22 +102,18 @@ install_h2spec() {
101102
}
102103

103104
install_packaging_and_python() {
104-
# For packaging
105-
tdnf --snapshottime=$SOURCE_DATE_EPOCH -y install rpm-build &&
106-
107-
# For end to end tests and scripts
108-
tdnf --snapshottime=$SOURCE_DATE_EPOCH -y install python3-pip &&
109-
pip install uv==0.10.8
110-
}
111-
112-
install_rust() {
113-
# Rust
114-
tdnf --snapshottime=$SOURCE_DATE_EPOCH -y install rust
105+
local packages=(
106+
# For packaging
107+
rpm-build
108+
# For end to end tests and scripts
109+
python3-pip
110+
)
111+
tdnf --snapshottime=$SOURCE_DATE_EPOCH -y install "${packages[@]}" &&
112+
pip install uv==0.11.19
115113
}
116114

117115
retry "Source control dependencies" install_source_control
118116
retry "Build dependencies" install_build_dependencies
119117
retry "Test dependencies" install_test_dependencies
120118
retry "h2spec installation" install_h2spec
121119
retry "Packaging and Python dependencies" install_packaging_and_python
122-
retry "Rust dependencies" install_rust

0 commit comments

Comments
 (0)