Skip to content

Commit a65f98d

Browse files
committed
Merge branch 'master' into fix_accumulator_for_new_segment
2 parents 6936ed3 + 6aa4335 commit a65f98d

Some content is hidden

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

50 files changed

+1350
-41
lines changed

.github/workflows/backwards_compatibility.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,17 @@ jobs:
7979
steps:
8080
- run: echo "${{ needs.check_commit_message.outputs.should_skip == 'true' }}"
8181

82-
- uses: actions/checkout@v4
82+
- name: Checkout code (origin/master)
83+
uses: actions/checkout@v4
8384
with:
84-
ref: ${{ github.ref }}
85+
ref: master
8586
fetch-depth: 0
8687

8788
- name: Cache cargo & target directories
8889
uses: Swatinem/rust-cache@v2
8990
with:
9091
key: "v2"
9192

92-
- name: Reset to origin/master
93-
run: git fetch && git reset --hard origin/master
94-
9593
- name: Build iggy-server (origin/master)
9694
run: IGGY_CI_BUILD=true cargo build
9795

@@ -124,12 +122,23 @@ jobs:
124122
- name: Remove iggy-server logs (origin/master)
125123
run: rm local_data/logs/iggy*
126124

127-
- name: Reset to pull request branch (PR)
128-
run: git reset --hard origin/$BRANCH_NAME
125+
- name: Copy local_data directory (origin/master)
126+
run: cp -r local_data ..
127+
128+
- name: Checkout code (PR)
129+
uses: actions/checkout@v4
130+
with:
131+
repository: ${{ github.event.pull_request.head.repo.full_name }}
132+
ref: ${{ github.event.pull_request.head.ref }}
133+
fetch-depth: 0
134+
clean: false
129135

130136
- name: Build iggy-server (PR)
131137
run: IGGY_CI_BUILD=true cargo build
132138

139+
- name: Restore local_data directory (PR)
140+
run: cp -r ../local_data .
141+
133142
- uses: JarvusInnovations/background-action@v1
134143
name: Run iggy-server in background (PR)
135144
with:

Cargo.lock

Lines changed: 195 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ To help us incorporate your changes efficiently, please adhere to the following
99

1010
## General Coding Remarks
1111

12-
- **Code Linting**: Run `rustfmt` to ensure your code adheres to the project's style.
12+
- **Code Formatting**: Run `cargo fmt` to ensure your code adheres to the project's style.
13+
- **Code Linting**: Run `cargo clippy --all-targets --all-features -- -D warnings` to make sure your code is lint-free.
1314
- **Unit Testing**: Write or update unit tests to cover your changes.
1415
- **Integration Testing**: Write or update integration tests to cover your changes.
1516
- **Project Structure**: Follow the `iggy` project's structure and coding style.
1617
- **Build Integrity**: Ensure your code compiles and runs error-free.
18+
- **Check unused dependencies**: Run `cargo machete` to make sure no unused dependencies made their way into your changeset.
19+
- **Sort dependencies**: Run `cargo sort --workspace` so that the content of the toml files stay ordered.
1720

1821
## Commit Message Rules
1922

cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "iggy-cli"
3-
version = "0.8.1"
3+
version = "0.8.2"
44
edition = "2021"
55
authors = ["[email protected]"]
66
repository = "https://github.com/iggy-rs/iggy"

0 commit comments

Comments
 (0)