From 92291133b7c9c4b2e08f316404c59a0934c1bb6f Mon Sep 17 00:00:00 2001 From: James Brundage <+@noreply.github.com> Date: Sat, 21 Sep 2024 21:30:09 -0700 Subject: [PATCH] fix: Irregular Action - Testing on Branch ( Fixes #233 ) --- .github/workflows/IrregularTests.yml | 11 ++++++++--- Build/GitHub/Steps/UseIrregularAction.psd1 | 17 +++++++++++------ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.github/workflows/IrregularTests.yml b/.github/workflows/IrregularTests.yml index dd54bcf..e899771 100644 --- a/.github/workflows/IrregularTests.yml +++ b/.github/workflows/IrregularTests.yml @@ -572,9 +572,14 @@ jobs: - name: Use PSSVG Action uses: StartAutomating/PSSVG@main id: PSSVG - - name: Use Irregular Action - uses: StartAutomating/Irregular@master - id: Irregular + - name: Run Irregular (from main) + if: ${{github.ref_name == 'master'}} + uses: StartAutomating/Irregular@main + id: IrregularMain + - name: Run Irregular (on branch) + if: ${{github.ref_name != 'master'}} + uses: ./ + id: IrregularBranch - name: BuildPipeScript uses: StartAutomating/PipeScript@main - name: UseEZOut diff --git a/Build/GitHub/Steps/UseIrregularAction.psd1 b/Build/GitHub/Steps/UseIrregularAction.psd1 index 6de7441..2839e33 100644 --- a/Build/GitHub/Steps/UseIrregularAction.psd1 +++ b/Build/GitHub/Steps/UseIrregularAction.psd1 @@ -1,7 +1,12 @@ @{ - name = 'Use Irregular Action' - uses = 'StartAutomating/Irregular@master' - id = 'Irregular' -} - - + name = 'Run Irregular (from main)' + if = '${{github.ref_name == ''master''}}' + uses = 'StartAutomating/Irregular@main' + id = 'IrregularMain' +}, +@{ + name = 'Run Irregular (on branch)' + if = '${{github.ref_name != ''master''}}' + uses = './' + id = 'IrregularBranch' +} \ No newline at end of file