diff --git a/action.yml b/action.yml index 811d5a7..8e73ec2 100644 --- a/action.yml +++ b/action.yml @@ -11,11 +11,11 @@ inputs: error-on-no-successful-workflow: description: "By default, if no successful workflow is found on the main branch to determine the SHA, we will log a warning and use HEAD~1. Enable this option to error and exit instead." default: "false" - workflow-id: - description: "The ID of the workflow to track or name of the file name. E.g. ci.yml. Defaults to current workflow" last-successful-event: description: "The type of event to check for the last successful commit corresponding to that workflow-id, E.g. push, pull-request, release etc" default: "push" + workflow-id: + description: "The ID of the workflow to track or name of the file name. E.g. ci.yml. Defaults to current workflow" outputs: base: @@ -31,7 +31,7 @@ runs: - name: Set base and head SHAs used for nx affected id: setSHAs shell: bash - run: node ${{ github.action_path }}/dist/index.js ${{ github.token }} ${{ inputs.main-branch-name }} ${{ inputs.error-on-no-successful-workflow }} ${{ inputs.workflow-id }} ${{ inputs.last-successful-event }} + run: node ${{ github.action_path }}/dist/index.js ${{ github.token }} ${{ inputs.main-branch-name }} ${{ inputs.error-on-no-successful-workflow }} ${{ inputs.last-successful-event }} ${{ inputs.workflow-id }} - name: Log base and head SHAs used for nx affected shell: bash diff --git a/dist/index.js b/dist/index.js index e1bd720..d6de4f5 100644 --- a/dist/index.js +++ b/dist/index.js @@ -6371,8 +6371,8 @@ const { runId, repo: { repo, owner }, eventName } = github.context; process.env.GITHUB_TOKEN = process.argv[2]; const mainBranchName = process.argv[3]; const errorOnNoSuccessfulWorkflow = process.argv[4]; -const workflowId = process.argv[5]; -const lastSuccessfulEvent = process.argv[6]; +const lastSuccessfulEvent = process.argv[5]; +const workflowId = process.argv[6]; let BASE_SHA; (async () => { diff --git a/find-successful-workflow.js b/find-successful-workflow.js index ca0c057..a8b91a5 100644 --- a/find-successful-workflow.js +++ b/find-successful-workflow.js @@ -7,8 +7,8 @@ const { runId, repo: { repo, owner }, eventName } = github.context; process.env.GITHUB_TOKEN = process.argv[2]; const mainBranchName = process.argv[3]; const errorOnNoSuccessfulWorkflow = process.argv[4]; -const workflowId = process.argv[5]; -const lastSuccessfulEvent = process.argv[6]; +const lastSuccessfulEvent = process.argv[5]; +const workflowId = process.argv[6]; let BASE_SHA; (async () => { diff --git a/package-lock.json b/package-lock.json index c324adf..3f1ddda 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "version": "2.0.0", + "version": "2.1.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b4e8f48..e61628a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "2.1.1", + "version": "2.1.2", "license": "MIT", "description": "This package.json is here purely to control the version of the Action, in combination with https://github.com/JamesHenry/publish-shell-action", "scripts": {