Skip to content

Commit 032ba35

Browse files
authored
Merge branch 'master' into non_string_header_key
2 parents 8206944 + e84daf4 commit 032ba35

File tree

9 files changed

+35
-43
lines changed

9 files changed

+35
-43
lines changed

.github/actions/rust/pre-merge/action.yml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,17 @@ runs:
104104
- name: Build and test
105105
if: inputs.task == 'test'
106106
run: |
107-
build_start=$(date +%s)
107+
bins_start=$(date +%s)
108108
cargo build --locked --all-targets
109-
build_end=$(date +%s)
110-
build_duration=$((build_end - build_start))
111-
echo "::notice::Build completed in ${build_duration}s ($(date -ud @${build_duration} +'%M:%S'))"
109+
bins_end=$(date +%s)
110+
bins_duration=$((bins_end - bins_start))
111+
echo "::notice::All targets built in ${bins_duration}s ($(date -ud @${bins_duration} +'%M:%S'))"
112+
113+
compile_start=$(date +%s)
114+
cargo test --locked --no-run
115+
compile_end=$(date +%s)
116+
compile_duration=$((compile_end - compile_start))
117+
echo "::notice::Tests compiled in ${compile_duration}s ($(date -ud @${compile_duration} +'%M:%S'))"
112118
113119
test_start=$(date +%s)
114120
if command -v cargo-nextest &> /dev/null; then
@@ -118,13 +124,18 @@ runs:
118124
fi
119125
test_end=$(date +%s)
120126
test_duration=$((test_end - test_start))
121-
echo "::notice::Tests completed in ${test_duration}s ($(date -ud @${test_duration} +'%M:%S'))"
127+
echo "::notice::Tests executed in ${test_duration}s ($(date -ud @${test_duration} +'%M:%S'))"
122128
129+
build_duration=$((bins_duration + compile_duration))
130+
total_duration=$((build_duration + test_duration))
123131
echo ""
124132
echo "========================================="
125-
echo "Build time: ${build_duration}s ($(date -ud @${build_duration} +'%M:%S'))"
126-
echo "Test time: ${test_duration}s ($(date -ud @${test_duration} +'%M:%S'))"
127-
echo "Total time: $((build_duration + test_duration))s ($(date -ud @$((build_duration + test_duration)) +'%M:%S'))"
133+
echo "All targets build: ${bins_duration}s ($(date -ud @${bins_duration} +'%M:%S'))"
134+
echo "Tests compile: ${compile_duration}s ($(date -ud @${compile_duration} +'%M:%S'))"
135+
echo "Tests execute: ${test_duration}s ($(date -ud @${test_duration} +'%M:%S'))"
136+
echo "-----------------------------------------"
137+
echo "Total build: ${build_duration}s ($(date -ud @${build_duration} +'%M:%S'))"
138+
echo "Total time: ${total_duration}s ($(date -ud @${total_duration} +'%M:%S'))"
128139
echo "========================================="
129140
shell: bash
130141

.github/workflows/_common.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ jobs:
3333
rust-versions:
3434
name: Check Rust versions sync
3535
runs-on: ubuntu-latest
36-
env:
37-
IGGY_CI_BUILD: true
3836
steps:
3937
- uses: actions/checkout@v4
4038

@@ -45,8 +43,6 @@ jobs:
4543
name: Check PR Title
4644
if: github.event_name == 'pull_request' && !inputs.skip_pr_title
4745
runs-on: ubuntu-latest
48-
env:
49-
IGGY_CI_BUILD: true
5046
steps:
5147
- name: Validate PR Title
5248
uses: amannn/action-semantic-pull-request@v5
@@ -107,8 +103,6 @@ jobs:
107103
license-headers:
108104
name: Check license headers
109105
runs-on: ubuntu-latest
110-
env:
111-
IGGY_CI_BUILD: true
112106
steps:
113107
- uses: actions/checkout@v4
114108

@@ -127,8 +121,6 @@ jobs:
127121
license-list:
128122
name: Check licenses list
129123
runs-on: ubuntu-latest
130-
env:
131-
IGGY_CI_BUILD: true
132124
steps:
133125
- uses: actions/checkout@v4
134126

@@ -145,8 +137,6 @@ jobs:
145137
markdown:
146138
name: Markdown lint
147139
runs-on: ubuntu-latest
148-
env:
149-
IGGY_CI_BUILD: true
150140
steps:
151141
- uses: actions/checkout@v4
152142

@@ -164,8 +154,6 @@ jobs:
164154
shellcheck:
165155
name: Shell scripts lint
166156
runs-on: ubuntu-latest
167-
env:
168-
IGGY_CI_BUILD: true
169157
steps:
170158
- name: Checkout code
171159
uses: actions/checkout@v4
@@ -182,8 +170,6 @@ jobs:
182170
trailing-whitespace:
183171
name: Check trailing whitespace
184172
runs-on: ubuntu-latest
185-
env:
186-
IGGY_CI_BUILD: true
187173
steps:
188174
- name: Checkout code
189175
uses: actions/checkout@v4
@@ -196,8 +182,6 @@ jobs:
196182
trailing-newline:
197183
name: Check trailing newline
198184
runs-on: ubuntu-latest
199-
env:
200-
IGGY_CI_BUILD: true
201185
steps:
202186
- name: Checkout code
203187
uses: actions/checkout@v4
@@ -210,8 +194,6 @@ jobs:
210194
toml-format:
211195
name: Check TOML formatting
212196
runs-on: ubuntu-latest
213-
env:
214-
IGGY_CI_BUILD: true
215197
steps:
216198
- name: Checkout code
217199
uses: actions/checkout@v4
@@ -243,8 +225,6 @@ jobs:
243225
]
244226
if: always()
245227
runs-on: ubuntu-latest
246-
env:
247-
IGGY_CI_BUILD: true
248228
steps:
249229
- name: Summary
250230
run: |

.github/workflows/_detect.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ on:
5151
jobs:
5252
detect:
5353
runs-on: ubuntu-latest
54-
env:
55-
IGGY_CI_BUILD: true
5654
outputs:
5755
rust_matrix: ${{ steps.mk.outputs.rust_matrix }}
5856
python_matrix: ${{ steps.mk.outputs.python_matrix }}

.github/workflows/_test.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ jobs:
4141
'ubuntu-latest'
4242
}}
4343
timeout-minutes: 60
44-
env:
45-
IGGY_CI_BUILD: true
4644
steps:
4745
- name: Checkout code
4846
uses: actions/checkout@v4

.github/workflows/_test_bdd.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ jobs:
3636
run:
3737
runs-on: ubuntu-latest
3838
timeout-minutes: 60
39-
env:
40-
IGGY_CI_BUILD: true
4139
steps:
4240
- name: Cleanup disk space
4341
run: |

.github/workflows/_test_examples.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ jobs:
3535
run:
3636
runs-on: ubuntu-latest
3737
timeout-minutes: 60
38-
env:
39-
IGGY_CI_BUILD: true
4038
steps:
4139
- name: Checkout code
4240
uses: actions/checkout@v4

.github/workflows/pre-merge.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ on:
2121
branches: [master]
2222
workflow_dispatch:
2323

24-
env:
25-
IGGY_CI_BUILD: true
26-
2724
concurrency:
2825
group: ${{ github.workflow }}-${{ github.ref }}
2926
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}

Cargo.toml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,5 +248,17 @@ zip = { version = "7.2.0", default-features = false, features = ["deflate"] }
248248
lto = true
249249
codegen-units = 1
250250

251-
[profile.dev]
252-
opt-level = 1
251+
# [profile.dev]
252+
# opt-level = 1
253+
254+
[profile.dev.package.argon2]
255+
opt-level = 3
256+
257+
[profile.dev.package.twox-hash]
258+
opt-level = 3
259+
260+
[profile.dev.package.rand_chacha]
261+
opt-level = 3
262+
263+
[profile.dev.package.iggy_common]
264+
opt-level = 3

scripts/check-backwards-compat.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ ok "worktree at $MASTER_DIR"
163163
pushd "$MASTER_DIR" >/dev/null
164164

165165
info "Building iggy-server & benches (baseline: $MASTER_REF)"
166-
IGGY_CI_BUILD=true cargo build --bins
166+
cargo build --locked --bin iggy-server --bin iggy-bench
167167
ok "built baseline"
168168

169169
info "Starting iggy-server (baseline)"
@@ -220,7 +220,7 @@ git rev-parse --verify "$PR_REF^{commit}" >/dev/null 2>&1 || die "PR_REF '$PR_RE
220220
git checkout -q "$PR_REF"
221221

222222
info "Building iggy-server & benches (PR: $PR_REF)"
223-
IGGY_CI_BUILD=true cargo build --bins
223+
cargo build --locked --bin iggy-server --bin iggy-bench
224224
ok "built PR"
225225

226226
info "Restoring baseline local_data/ into PR workspace"

0 commit comments

Comments
 (0)