Skip to content

Commit

Permalink
Merge branch 'master' into fix_accumulator_for_new_segment
Browse files Browse the repository at this point in the history
  • Loading branch information
numinnex committed Nov 13, 2024
2 parents 6936ed3 + 6aa4335 commit a65f98d
Show file tree
Hide file tree
Showing 50 changed files with 1,350 additions and 41 deletions.
23 changes: 16 additions & 7 deletions .github/workflows/backwards_compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,19 +79,17 @@ jobs:
steps:
- run: echo "${{ needs.check_commit_message.outputs.should_skip == 'true' }}"

- uses: actions/checkout@v4
- name: Checkout code (origin/master)
uses: actions/checkout@v4
with:
ref: ${{ github.ref }}
ref: master
fetch-depth: 0

- name: Cache cargo & target directories
uses: Swatinem/rust-cache@v2
with:
key: "v2"

- name: Reset to origin/master
run: git fetch && git reset --hard origin/master

- name: Build iggy-server (origin/master)
run: IGGY_CI_BUILD=true cargo build

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

- name: Reset to pull request branch (PR)
run: git reset --hard origin/$BRANCH_NAME
- name: Copy local_data directory (origin/master)
run: cp -r local_data ..

- name: Checkout code (PR)
uses: actions/checkout@v4
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.event.pull_request.head.ref }}
fetch-depth: 0
clean: false

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

- name: Restore local_data directory (PR)
run: cp -r ../local_data .

- uses: JarvusInnovations/background-action@v1
name: Run iggy-server in background (PR)
with:
Expand Down
200 changes: 195 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@ To help us incorporate your changes efficiently, please adhere to the following

## General Coding Remarks

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

## Commit Message Rules

Expand Down
2 changes: 1 addition & 1 deletion cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "iggy-cli"
version = "0.8.1"
version = "0.8.2"
edition = "2021"
authors = ["[email protected]"]
repository = "https://github.com/iggy-rs/iggy"
Expand Down
Loading

0 comments on commit a65f98d

Please sign in to comment.