Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
elmerbulthuis committed Sep 21, 2023
2 parents 9254e22 + f1061ae commit e93b1e1
Show file tree
Hide file tree
Showing 17 changed files with 114 additions and 121 deletions.
50 changes: 0 additions & 50 deletions .circleci/config.yml

This file was deleted.

9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
root = true

[*]
charset = utf-8
insert_final_newline = true
end_of_line = lf
indent_style = space
indent_size = 4
max_line_length = 100
18 changes: 18 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
on:
push:
tags:
- v*

jobs:

publish-crates:
runs-on: ubuntu-latest
container: rust:1.64-alpine3.15
env:
CARGO_HOME: ${{ github.workspace }}/.cargo
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
steps:
- uses: actions/checkout@v3
- run: apk add cargo-edit
- run: cargo set-version ${GITHUB_REF_NAME:1}
- run: cargo publish --allow-dirty
40 changes: 40 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
on:
- push
- pull_request

jobs:

test-unit:
runs-on: ubuntu-latest
container: rust:1.64-alpine3.15
env:
CARGO_HOME: ${{ github.workspace }}/.cargo
steps:
- uses: actions/checkout@v3
- run: apk add tar
- uses: actions/cache@v3
with:
key: ${{ github.job }}-${{ hashFiles('Cargo.lock') }}
path: |
.cargo/
target/
- run: apk add build-base
- run: cargo test --all-targets

test-lint:
runs-on: ubuntu-latest
container: rust:1.64-alpine3.15
env:
CARGO_HOME: ${{ github.workspace }}/.cargo
steps:
- uses: actions/checkout@v3
- run: apk add tar
- uses: actions/cache@v3
with:
key: ${{ github.job }}-${{ hashFiles('Cargo.lock') }}
path: |
.cargo/
target/
- run: apk add musl-dev
- run: rustup component add clippy
- run: cargo clippy --all-targets
13 changes: 10 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/target
**/*.rs.bk
Cargo.lock
.*

!.gitignore
!.editorconfig

/target/
/coverage/

!/.vscode/
!/.github/
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/codeStyles/codeStyleConfig.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

15 changes: 0 additions & 15 deletions .idea/reduxr.iml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

17 changes: 9 additions & 8 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{
// See http://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp

// List of extensions which should be recommended for users of this workspace.
"recommendations": [
"rust-lang.rust",
"vadimcn.vscode-lldb"
"rust-lang.rust-analyzer",
"vadimcn.vscode-lldb",
"ryanluker.vscode-coverage-gutters",
"editorconfig.editorconfig",
"tamasfe.even-better-toml"
],
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
"unwantedRecommendations": [

]
}
"unwantedRecommendations": []
}

17 changes: 8 additions & 9 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
// Place your settings in this file to overwrite default and user settings.
{
"editor.formatOnSave": true,
"editor.rulers": [
100
],
"rust.clippy_preference": "on",
"rust.all_targets": true,
"rust-client.channel": "nightly"
}
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll": true,
"source.organizeImports": true
},
"editor.rulers": [100],
"rust-analyzer.check.command": "clippy"
}
7 changes: 7 additions & 0 deletions Cargo.lock

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

9 changes: 1 addition & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
# ReduxR - Redux for rust
This repository provides a redux store, with some examples that show how to do redux in rust.

## Automated tests
Never commit something that breaks the build! You can easily prevent this by linking the `pre-commit` script as a git `pre-commit` hook!

like this:
```bash
ln pre-commit .git/hooks/pre-commit
```
This repository provides a redux store, with some examples that show how to do redux in rust.
11 changes: 11 additions & 0 deletions cspell.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json",
"version": "0.2",
"language": "en",
"useGitignore": true,
"enableGlobDot": true,
"words": [
"reduxr",
"todos"
]
}
5 changes: 0 additions & 5 deletions pre-commit

This file was deleted.

2 changes: 1 addition & 1 deletion src/store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ where
self
}

/// Dispatch action through the middleware and eventualle reduce state with it!
/// Dispatch action through the middleware and eventually reduce state with it!
pub fn dispatch(&self, action: Action) {
(self.dispatch_handler)(self, action);
}
Expand Down

0 comments on commit e93b1e1

Please sign in to comment.