From f2269742af06f59dc2d3f32396fa1b9e0f549705 Mon Sep 17 00:00:00 2001 From: Michael Born Date: Thu, 1 Feb 2024 11:14:26 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20CI:=20Give=20up=20on=20env=20var?= =?UTF-8?q?s=20within=20CI=20build=20if=20conditional?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 2 +- .github/workflows/format.yml | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index facaac2d..50d187fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: uses: ./.github/workflows/tests.yml format: - if: "!contains(github.event.head_commit.message, '[ci skip]')" + if: "!contains(github.event.head_commit.message, '[ci skip]') && github.ref_name != 'main' && github.ref_name != 'master'" uses: ./.github/workflows/format.yml release: diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index e209b5af..2b624c71 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -3,13 +3,9 @@ name: Format Java and CFML Source Code on: workflow_call: -env: - SNAPSHOT: ${{ github.ref_name != 'main' && github.ref_name != 'master' }} - jobs: formatJava: runs-on: ubuntu-latest - if: ${{ env.SNAPSHOT == 'true' }} steps: - uses: actions/checkout@v4 @@ -30,7 +26,6 @@ jobs: formatCFML: runs-on: ubuntu-latest needs: [ formatJava ] - if: ${{ env.SNAPSHOT == 'true' }} steps: - name: Checkout Repository uses: actions/checkout@v4