changing id handling

Author: benc-uk

.github/workflows/build-test.yaml

@@ -32,7 +32,6 @@ jobs:
       uses: ./
       with:
         workflow: '1854247'
-        use-workflow-id: 'true'
         token: ${{ secrets.PERSONAL_TOKEN }}
         inputs: '{"message": "Mango jam"}'
 

action.yaml

@@ -3,15 +3,11 @@ description: 'Trigger and chain GitHub Actions workflows with workflow_dispatch
 
 inputs:
   workflow: 
-    description: 'Name of workflow to run'
+    description: 'Name or ID of workflow to run'
     required: true
   token: 
     description: 'GitHub token with repo write access, can NOT use secrets.GITHUB_TOKEN, see readme'
     required: true
-  use-workflow-id:
-    description: 'When true the workflow input is treated as an id rather than name'
-    required: false
-    default: 'false'
   inputs:
     description: 'Inputs to pass to the workflow, must be a JSON string.'
     required: false

src/main.ts

@@ -7,7 +7,6 @@ async function run(): Promise<void> {
     // Required inputs
     const token = core.getInput('token')
     const workflowReference = core.getInput('workflow')
-    const workflowIdFlag = core.getInput('use-workflow-id') || 'false'
     // Optional inputs, with defaults
     const ref = core.getInput('ref')   || github.context.ref
     const repo = core.getInput('repo') || `${github.context.repo.owner}/${github.context.repo.repo}`
@@ -22,33 +21,27 @@ async function run(): Promise<void> {
     // Get octokit client for making API calls
     const octokit = github.getOctokit(token)
 
-    let workflowId = ''
-    if(workflowIdFlag !== 'true') {
-      // List workflows via API
-      const listResp = await octokit.request(`GET /repos/${repo}/actions/workflows`, {
-        ref: ref,
-        inputs: inputs
-      })
-      if(listResp.status != 200) throw new Error(`Got HTTP ${listResp.status} calling list workflows API 💩`)
-
-      // Debug response if ACTIONS_STEP_DEBUG is enabled
-      core.debug(listResp.data)
-
-      // Locate workflow by name as we need it's id
-      const foundWorkflow = listResp.data.workflows.find((wf: Record<string, string>) => {
-        return wf['name'] === workflowReference
-      })
-      if(!foundWorkflow) throw new Error(`Unable to find workflow named '${workflowReference}' in ${repo} 😥`)
-
-      workflowId = foundWorkflow.id
-    } else {
-      workflowId = workflowReference
-    }
+    // List workflows via API
+    const listResp = await octokit.request(`GET /repos/${repo}/actions/workflows`, {
+      ref: ref,
+      inputs: inputs
+    })
+    if(listResp.status != 200) throw new Error(`Got HTTP ${listResp.status} calling list workflows API 💩`)
+
+    // Debug response if ACTIONS_STEP_DEBUG is enabled
+    core.debug(listResp.data)
+
+    // Locate workflow by name as we need it's id
+    const foundWorkflow = listResp.data.workflows.find((wf: Record<string, string>) => {
+      // Match on name or id
+      return (wf['name'] === workflowReference || wf['id'] === workflowReference)
+    })
+    if(!foundWorkflow) throw new Error(`Unable to find workflow '${workflowReference}' in ${repo} 😥`)
 
-    console.log(`Workflow id is: ${workflowId}`)
+    console.log(`Workflow id is: ${foundWorkflow.id}`)
 
     // Call workflow_dispatch API
-    const dispatchResp = await octokit.request(`POST /repos/${repo}/actions/workflows/${workflowId}/dispatches`, {
+    const dispatchResp = await octokit.request(`POST /repos/${repo}/actions/workflows/${foundWorkflow.id}/dispatches`, {
       ref: ref,
       inputs: inputs
     })