Add working-directory param

README.md

@@ -53,13 +53,14 @@ jobs:
 
 ## Inputs
 
-| Name        | Required | Description                                                                                                                            | Type   | Default |
-| ------------| :------: | ---------------------------------------------------------------------------------------------------------------------------------------| ------ | --------|
-| `token`     | ✓        | GitHub secret token, usually a `${{ secrets.GITHUB_TOKEN }}`                                                                           | string |         |
-| `toolchain` |          | Rust toolchain to use; override or system default toolchain will be used if omitted                                                    | string |         |
-| `args`      |          | Arguments for the `cargo clippy` command                                                                                               | string |         |
-| `use-cross` |          | Use [`cross`](https://github.com/rust-embedded/cross) instead of `cargo`                                                               | bool   | false   |
-| `name`      |          | Name of the created GitHub check. If running this action multiple times, each run must have a unique name.                             | string | clippy  |
+| Name                | Required | Description                                                                                                | Type   | Default |
+| ------------------- | :------: | ---------------------------------------------------------------------------------------------------------- | ------ | ------- |
+| `token`             |    ✓     | GitHub secret token, usually a `${{ secrets.GITHUB_TOKEN }}`                                               | string |         |
+| `toolchain`         |          | Rust toolchain to use; override or system default toolchain will be used if omitted                        | string |         |
+| `args`              |          | Arguments for the `cargo clippy` command                                                                   | string |         |
+| `use-cross`         |          | Use [`cross`](https://github.com/rust-embedded/cross) instead of `cargo`                                   | bool   | false   |
+| `name`              |          | Name of the created GitHub check. If running this action multiple times, each run must have a unique name. | string | clippy  |
+| `working-directory` |          | Specify where rust directory is                                                                            | string | .       |
 
 For extra details about the `toolchain`, `args` and `use-cross` inputs,
 see [`cargo` Action](https://github.com/actions-rs/cargo#inputs) documentation.

action.yml

@@ -15,6 +15,9 @@ inputs:
   args:
     description: Arguments for the cargo command
     required: false
+  working-directory:
+    description: Specify where rust directory is. By default runs in root directory
+    required: false
   use-cross:
     description: Use cross instead of cargo
     default: false

package.json

@@ -1,6 +1,6 @@
 {
     "name": "rust-clippy-check",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "private": false,
     "description": "Run clippy and annotate the diff with errors and warnings",
     "main": "dist/index.js",

src/check.ts

@@ -1,5 +1,6 @@
 import * as core from '@actions/core';
 import * as github from '@actions/github';
+import {join as pathJoin} from 'path';
 
 const pkg = require('../package.json');
 import {plural} from './render';
@@ -53,8 +54,10 @@ interface Stats {
 export class CheckRunner {
     private annotations: Array<ChecksCreateParamsOutputAnnotations>;
     private stats: Stats;
+    private workingDirectory?: string;
 
-    constructor() {
+    constructor(workingDirectory: string | undefined) {
+        this.workingDirectory = workingDirectory;
         this.annotations = [];
         this.stats = {
             ice: 0,
@@ -104,7 +107,7 @@ export class CheckRunner {
                 break;
         }
 
-        this.annotations.push(CheckRunner.makeAnnotation(contents));
+        this.annotations.push(this.makeAnnotation(contents));
     }
 
     public async executeCheck(options: CheckOptions): Promise<void> {
@@ -340,7 +343,7 @@ See https://github.com/actions-rs/clippy-check/issues/2 for details.`);
     /// Convert parsed JSON line into the GH annotation object
     ///
     /// https://developer.github.com/v3/checks/runs/#annotations-object
-    static makeAnnotation(contents: CargoMessage): ChecksCreateParamsOutputAnnotations {
+    private makeAnnotation(contents: CargoMessage): ChecksCreateParamsOutputAnnotations {
         const primarySpan: undefined | DiagnosticSpan = contents.message.spans.find((span) => span.is_primary == true);
         // TODO: Handle it properly
         if (null == primarySpan) {
@@ -362,8 +365,14 @@ See https://github.com/actions-rs/clippy-check/issues/2 for details.`);
                 break;
         }
 
+        let path = primarySpan.file_name;
+
+        if(this.workingDirectory) {
+            path = pathJoin(this.workingDirectory, path);
+        }
+
         let annotation: ChecksCreateParamsOutputAnnotations = {
-            path: primarySpan.file_name,
+            path,
             start_line: primarySpan.line_start,
             end_line: primarySpan.line_end,
             annotation_level: annotation_level,

src/input.ts

@@ -13,6 +13,7 @@ export interface Input {
     args: string[],
     useCross: boolean,
     name: string,
+    workingDirectory?: string,
 }
 
 export function get(): Input {
@@ -23,12 +24,14 @@ export function get(): Input {
     }
     const useCross = input.getInputBool('use-cross');
     const name = input.getInput('name');
+    const workingDirectory = input.getInput('working-directory');
 
     return {
         token: input.getInput('token', {required: true}),
         args: args,
         useCross: useCross,
         toolchain: toolchain || undefined,
-        name
+        name,
+        workingDirectory: workingDirectory || undefined
     }
 }

src/main.ts

@@ -1,6 +1,7 @@
 import * as core from '@actions/core';
 import * as exec from '@actions/exec';
 import * as github from '@actions/github';
+import {join as pathJoin} from 'path';
 
 import {Cargo, Cross} from '@actions-rs/core';
 import * as input from './input';
@@ -44,15 +45,23 @@ export async function run(actionInput: input.Input): Promise<void> {
     if (actionInput.toolchain) {
         args.push(`+${actionInput.toolchain}`);
     }
+
     args.push('clippy');
+
     // `--message-format=json` should just right after the `cargo clippy`
     // because usually people are adding the `-- -D warnings` at the end
     // of arguments and it will mess up the output.
     args.push('--message-format=json');
 
     args = args.concat(actionInput.args);
 
-    let runner = new CheckRunner();
+    let cwd = undefined;
+
+    if (actionInput.workingDirectory) {
+        cwd = pathJoin(process.cwd(), actionInput.workingDirectory);
+    }
+
+    let runner = new CheckRunner(actionInput.workingDirectory);
     let clippyExitCode: number = 0;
     try {
         core.startGroup('Executing cargo clippy (JSON output)');
@@ -63,7 +72,8 @@ export async function run(actionInput: input.Input): Promise<void> {
                 stdline: (line: string) => {
                     runner.tryPush(line);
                 }
-            }
+            },
+            cwd
         });
     } finally {
         core.endGroup();