From 8157969a0d9411eb483e548aada39ab83132c1d1 Mon Sep 17 00:00:00 2001 From: Opeyemi Alao <54288773+Eeebru@users.noreply.github.com> Date: Wed, 17 Jan 2024 15:28:01 +0000 Subject: [PATCH 1/5] use action to get changed files --- .github/workflows/workflow-linter.yml | 29 +++++++-------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/.github/workflows/workflow-linter.yml b/.github/workflows/workflow-linter.yml index aa445d18..19ce67e9 100644 --- a/.github/workflows/workflow-linter.yml +++ b/.github/workflows/workflow-linter.yml @@ -19,36 +19,21 @@ jobs: repository: bitwarden/gh-actions fetch-depth: 0 - - name: Get changed workflows - id: changed-workflows - run: | - MODIFIED_WORKFLOWS=$(git diff --name-only origin/${{ github.base_ref }} | grep -E '.github/workflows/.*.(yml|yaml)' | tr '\n' ' ') - MODIFIED_EXISTING_WORKFLOWS="" - COUNT=0 - for workflow in $MODIFIED_WORKFLOWS; do - if [ -f $workflow ]; then - MODIFIED_EXISTING_WORKFLOWS+=" ${workflow}" - COUNT=$((COUNT+1)) - fi - done - echo "count=$COUNT" >> $GITHUB_OUTPUT - echo "modified-workflows=$MODIFIED_EXISTING_WORKFLOWS" >> $GITHUB_OUTPUT + - name: Get changed files + if: steps.changed-workflows.outputs.count != 0 + id: changed-files + uses: tj-actions/changed-files@716b1e13042866565e00e85fd4ec490e186c4a2f # v41.0.1 + with: + files: .github/workflows/** - name: Workflow Lint - if: steps.changed-workflows.outputs.count != 0 + if: steps.changed-files.outputs.any_changed == 'true' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} uses: bitwarden/gh-actions/lint-workflow@main with: workflows: ${{ steps.changed-workflows.outputs.modified-workflows }} - - name: Get changed files - if: steps.changed-workflows.outputs.count != 0 - id: changed-files - uses: tj-actions/changed-files@716b1e13042866565e00e85fd4ec490e186c4a2f # v41.0.1 - with: - files: .github/workflows/** - - name: Check for pinned versions if: steps.changed-files.outputs.any_changed == 'true' shell: bash From 88d9668308fa8a6fea9abf37229304c4b55d11fe Mon Sep 17 00:00:00 2001 From: Opeyemi Alao <54288773+Eeebru@users.noreply.github.com> Date: Wed, 17 Jan 2024 15:49:12 +0000 Subject: [PATCH 2/5] fix typo --- .github/workflows/workflow-linter.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/workflow-linter.yml b/.github/workflows/workflow-linter.yml index 19ce67e9..11fdde85 100644 --- a/.github/workflows/workflow-linter.yml +++ b/.github/workflows/workflow-linter.yml @@ -20,7 +20,6 @@ jobs: fetch-depth: 0 - name: Get changed files - if: steps.changed-workflows.outputs.count != 0 id: changed-files uses: tj-actions/changed-files@716b1e13042866565e00e85fd4ec490e186c4a2f # v41.0.1 with: From 3fd37000c4f1d7eddd4754beae4a0eab451ded6a Mon Sep 17 00:00:00 2001 From: Opeyemi Alao <54288773+Eeebru@users.noreply.github.com> Date: Wed, 17 Jan 2024 15:55:29 +0000 Subject: [PATCH 3/5] update changed files --- .github/workflows/workflow-linter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow-linter.yml b/.github/workflows/workflow-linter.yml index 11fdde85..bb613eb1 100644 --- a/.github/workflows/workflow-linter.yml +++ b/.github/workflows/workflow-linter.yml @@ -31,7 +31,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} uses: bitwarden/gh-actions/lint-workflow@main with: - workflows: ${{ steps.changed-workflows.outputs.modified-workflows }} + workflows: ${{ steps.changed-files.outputs.all_changed_files }} - name: Check for pinned versions if: steps.changed-files.outputs.any_changed == 'true' From dfd448ab864920f14db68e59aba51b11653188a5 Mon Sep 17 00:00:00 2001 From: Opeyemi Alao <54288773+Eeebru@users.noreply.github.com> Date: Wed, 17 Jan 2024 16:08:32 +0000 Subject: [PATCH 4/5] remove checkout --- .github/workflows/workflow-linter.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/workflow-linter.yml b/.github/workflows/workflow-linter.yml index bb613eb1..e12b9266 100644 --- a/.github/workflows/workflow-linter.yml +++ b/.github/workflows/workflow-linter.yml @@ -13,12 +13,6 @@ jobs: name: "Workflow Linter" runs-on: ubuntu-22.04 steps: - - name: Checkout Branch - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - repository: bitwarden/gh-actions - fetch-depth: 0 - - name: Get changed files id: changed-files uses: tj-actions/changed-files@716b1e13042866565e00e85fd4ec490e186c4a2f # v41.0.1 From 9251113ce0a76f4a008d2935928a0376df89da48 Mon Sep 17 00:00:00 2001 From: Opeyemi Alao <54288773+Eeebru@users.noreply.github.com> Date: Wed, 17 Jan 2024 16:09:47 +0000 Subject: [PATCH 5/5] revert remove checkout --- .github/workflows/workflow-linter.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/workflow-linter.yml b/.github/workflows/workflow-linter.yml index e12b9266..bb613eb1 100644 --- a/.github/workflows/workflow-linter.yml +++ b/.github/workflows/workflow-linter.yml @@ -13,6 +13,12 @@ jobs: name: "Workflow Linter" runs-on: ubuntu-22.04 steps: + - name: Checkout Branch + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + repository: bitwarden/gh-actions + fetch-depth: 0 + - name: Get changed files id: changed-files uses: tj-actions/changed-files@716b1e13042866565e00e85fd4ec490e186c4a2f # v41.0.1