From 5c8c71f14736d9da7334786a54824dbf79886f82 Mon Sep 17 00:00:00 2001 From: Modeseven Industrial Solutions Date: Wed, 6 Nov 2024 11:05:10 +0000 Subject: [PATCH] Chore: Update workflows (#220) Signed-off-by: Matthew Watkins --- .github/actions/gerrit-issue-id-action/action.yaml | 5 ----- .github/workflows/issue-id.yaml | 12 +++++++++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/actions/gerrit-issue-id-action/action.yaml b/.github/actions/gerrit-issue-id-action/action.yaml index c2b6f8f..5f4513d 100644 --- a/.github/actions/gerrit-issue-id-action/action.yaml +++ b/.github/actions/gerrit-issue-id-action/action.yaml @@ -18,11 +18,6 @@ outputs: runs: using: "composite" steps: - # - uses: actions/checkout@v4 - - - name: "Retrieve last commit message body" - id: retrieve - uses: os-climate/osc-github-devops/.github/actions/git-commit-message-body@main - name: "Check commit message for required string" id: check diff --git a/.github/workflows/issue-id.yaml b/.github/workflows/issue-id.yaml index 93c5344..6f060c8 100644 --- a/.github/workflows/issue-id.yaml +++ b/.github/workflows/issue-id.yaml @@ -8,6 +8,11 @@ name: "🏷️ [R] Check/Inject Issue-ID" # yamllint disable-line rule:truthy on: workflow_call: + #inputs: + # ISSUE_ID_LOOKUP_JSON: + # description: "JSON lookup table mapping users to JIRA tickets" + # type: string + # required: true permissions: {} @@ -15,13 +20,18 @@ jobs: issue-id: runs-on: "ubuntu-latest" + if: ${{ vars.ISSUE_ID_LOOKUP_JSON }} != '' permissions: contents: read pull-requests: write steps: - uses: actions/checkout@v4 + - name: "Retrieve last commit message body" + id: retrieve + uses: os-climate/osc-github-devops/.github/actions/git-commit-message-body@main + # yamllint disable-line rule:line-length - uses: os-climate/osc-github-devops/.github/actions/gerrit-issue-id-action@main with: - issue_id_lookup_json: ${{ env.ISSUE_ID_LOOKUP_JSON }} + issue_id_lookup_json: ${{ vars.ISSUE_ID_LOOKUP_JSON }}