Skip to content

Commit a81d369

Browse files
authored
Merge pull request #29 from qernal/develop
Arg changes, bump version
2 parents 2a0f617 + 5119715 commit a81d369

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.github/workflows/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
export branch_name=${GITHUB_REF##*/}
1717
echo "branch_name=${branch_name,,}" >> $GITHUB_ENV
1818
echo "commit_sha_short=$(git rev-parse --short "$GITHUB_SHA") >> $GITHUB_ENV"
19-
echo "release=v2.0.1" >> $GITHUB_ENV
19+
echo "release=v2.0.2" >> $GITHUB_ENV
2020
2121
- name: Build image
2222
shell: bash

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ jobs:
2525
name: Lint package
2626
steps:
2727
- uses: actions/checkout@v3
28-
- uses: qernal/[email protected].1
28+
- uses: qernal/[email protected].2
2929
```
3030
3131
## Action parameters
3232
3333
| Parameter | Description | Required |
3434
| ---- | ---- | ---- |
35-
| `clippy_args` | Arguments for clippy configuration, comma separated list as "--arg1,--arg2" | N |
35+
| `clippy_args` | Arguments for clippy configuration, space separated list as "--arg1 --arg2" | N |
3636
| `path_glob` | Glob for path finding (when a repository has multiple rust projects) | N |
3737
| `git_ssh_key` | Base64 encoded SSH key used for cargo when private git repositories are specified | N |
3838
| `github_pat` | GitHub PAT (token) for PAT authentication when private git repositories are specified | N |
@@ -45,7 +45,7 @@ Example;
4545
```yaml
4646
steps:
4747
- uses: actions/checkout@v3
48-
- uses: qernal/[email protected].1
48+
- uses: qernal/[email protected].2
4949
with:
5050
args: "--verbose,--all-targets"
5151
path_glob: "**/src"
@@ -58,7 +58,7 @@ Example;
5858
You can use the container without the context of the runner, and just run the container like so;
5959

6060
```bash
61-
docker run --rm -v `pwd`:/github/workspace ghcr.io/qernal/gh-actions/rust-clippy-x86_64:v2.0.0
61+
docker run --rm -v `pwd`:/github/workspace ghcr.io/qernal/gh-actions/rust-clippy-x86_64:v2.0.2
6262
```
6363

6464
Replace the `pwd` with your workspace if you're not running from the current directory
@@ -70,7 +70,7 @@ Replace the `pwd` with your workspace if you're not running from the current dir
7070
In the root of this repository, the following will buuld the container;
7171

7272
```bash
73-
docker build -t ghcr.io/qernal/gh-actions/rust-clippy-x86_64:v2.0.0 -f ./Dockerfile ./
73+
docker build -t ghcr.io/qernal/gh-actions/rust-clippy-x86_64:v2.0.2 -f ./Dockerfile ./
7474
```
7575

7676
### Running Locally
@@ -79,8 +79,8 @@ The GitHub action call can be simulated locally, an example of this is below;
7979

8080
```bash
8181
# Glob example of multiple cargos
82-
docker run --rm -e INPUT_PATH_GLOB=src/functions/*/*/ -e INPUT_THREADS=4 -e INPUT_GIT_SSH_KEY="$(cat ~/.ssh/my_key | base64 -w0)" -v `pwd`:/github/workspace ghcr.io/qernal/gh-actions/rust-clippy-x86_64:v2.0.1
82+
docker run --rm -e INPUT_PATH_GLOB=src/functions/*/*/ -e INPUT_THREADS=4 -e INPUT_GIT_SSH_KEY="$(cat ~/.ssh/my_key | base64 -w0)" -v `pwd`:/github/workspace ghcr.io/qernal/gh-actions/rust-clippy-x86_64:v2.0.2
8383

8484
# Specifiying rust version
85-
docker run --rm -e INPUT_RUST_VERSION=1.56 -e INPUT_THREADS=4 -e INPUT_GIT_SSH_KEY="$(cat ~/.ssh/my_key | base64 -w0)" -v `pwd`:/github/workspace ghcr.io/qernal/gh-actions/rust-clippy-x86_64:v2.0.1
85+
docker run --rm -e INPUT_RUST_VERSION=1.56 -e INPUT_THREADS=4 -e INPUT_GIT_SSH_KEY="$(cat ~/.ssh/my_key | base64 -w0)" -v `pwd`:/github/workspace ghcr.io/qernal/gh-actions/rust-clippy-x86_64:v2.0.2
8686
```

action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ inputs:
3030

3131
runs:
3232
using: 'docker'
33-
image: 'docker://ghcr.io/qernal/gh-actions/rust-clippy-x86_64:v2.0.1'
33+
image: 'docker://ghcr.io/qernal/gh-actions/rust-clippy-x86_64:v2.0.2'

src/clippy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ def __init__(self):
213213
self.config['path_glob'] = arg_path_glob
214214

215215
if arg_clippy_args != None and len(arg_clippy_args) > 0:
216-
self.args += arg_clippy_args.split(',')
216+
self.args += shlex.split(arg_clippy_args)
217217

218218
if arg_threads != None and arg_threads.isdigit():
219219
self.config['threads'] = int(arg_threads)

0 commit comments

Comments
 (0)