From 7587a851bf81627bd7e70c0761ad684fdf6a7fb6 Mon Sep 17 00:00:00 2001
From: Tyler Krys <Tyler.Krys@gov.bc.ca>
Date: Wed, 24 Jul 2024 15:55:13 -0700
Subject: [PATCH] Combine if statements that determine when workflow runs

---
 .../publish_react_component_library.yaml      | 89 +++++++++----------
 1 file changed, 44 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/publish_react_component_library.yaml b/.github/workflows/publish_react_component_library.yaml
index c3944966..be34cf57 100644
--- a/.github/workflows/publish_react_component_library.yaml
+++ b/.github/workflows/publish_react_component_library.yaml
@@ -10,58 +10,57 @@ on:
 jobs:
   publish-react-component-library:
     name: Public @bcgov/design-system-react-components
-    # Only run on merge, not close without merge
-    if: github.event.pull_request.merged == true
-    # Only run in bcgov/design-system repo, not forks
-    if: github.repository == 'bcgov/design-system'
+    # Only run on merge, not close without merge AND
+    # only run in bcgov/design-system repo, not forks.
+    if: ${{ github.event.pull_request.merged == true && github.repository == 'bcgov/design-system' }}
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v3
+      - name: Checkout code
+        uses: actions/checkout@v3
 
-    - name: Read .nvmrc
-      run: echo "GITHUB_NVMRC_VERSION=$(cat .nvmrc)" >> $GITHUB_ENV
-      working-directory: ./packages/react-components
+      - name: Read .nvmrc
+        run: echo "GITHUB_NVMRC_VERSION=$(cat .nvmrc)" >> $GITHUB_ENV
+        working-directory: ./packages/react-components
 
-    - name: Set up Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: ${{ env.GITHUB_NVMRC_VERSION }}
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.GITHUB_NVMRC_VERSION }}
 
-    - name: Install dependencies
-      run: npm install
-      working-directory: ./packages/react-components
+      - name: Install dependencies
+        run: npm install
+        working-directory: ./packages/react-components
 
-    - name: Install jq
-      run: sudo apt-get install -y jq
+      - name: Install jq
+        run: sudo apt-get install -y jq
 
-    # Use `jq` to change the package.json version to look like:
-    #
-    #   <version in package.json>-pr<PR # that caused the workflow run>
-    #
-    # So package.json version v1.2.3 with a run caused by merging PR #456 to
-    # `main` causes the version of the package on npm to look like:
-    #
-    #   1.2.3-pr456
-    #
-    # This is to ensure that it's easy to map an npm version to a particular PR.
-    #
-    - name: Update version in package.json
-      run: |
-        PR_NUMBER=${{ github.event.pull_request.number }}
-        CURRENT_VERSION=$(jq -r '.version' package.json)
-        NEW_VERSION="${CURRENT_VERSION}-pr${PR_NUMBER}"
-        jq --arg new_version "$NEW_VERSION" '.version = $new_version' package.json > tmp.json && mv tmp.json package.json
-      shell: bash
-      working-directory: ./packages/react-components
+      # Use `jq` to change the package.json version to look like:
+      #
+      #   <version in package.json>-pr<PR # that caused the workflow run>
+      #
+      # So package.json version v1.2.3 with a run caused by merging PR #456 to
+      # `main` causes the version of the package on npm to look like:
+      #
+      #   1.2.3-pr456
+      #
+      # This is to ensure that it's easy to map an npm version to a particular PR.
+      #
+      - name: Update version in package.json
+        run: |
+          PR_NUMBER=${{ github.event.pull_request.number }}
+          CURRENT_VERSION=$(jq -r '.version' package.json)
+          NEW_VERSION="${CURRENT_VERSION}-pr${PR_NUMBER}"
+          jq --arg new_version "$NEW_VERSION" '.version = $new_version' package.json > tmp.json && mv tmp.json package.json
+        shell: bash
+        working-directory: ./packages/react-components
 
-    - name: Build with Rollup script
-      run: npm run rollup
-      working-directory: ./packages/react-components
+      - name: Build with Rollup script
+        run: npm run rollup
+        working-directory: ./packages/react-components
 
-    - name: Publish to npm
-      run: npm publish --tag next
-      env:
-        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      working-directory: ./packages/react-components
+      - name: Publish to npm
+        run: npm publish --tag next
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        working-directory: ./packages/react-components