only need one condition

newrelic · May 21, 2024 · ca0b058 · ca0b058
1 parent e42937a
commit ca0b058
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
@@ -12,30 +12,35 @@ jobs:
     permissions:
       pull-requests: read
     outputs:
-      javascript_changed: ${{ steps.filter.output.javascript }}
-      release_files_changed: ${{ steps.filter.output.release_related_files }}
+      javascript_changed: ${{ steps.filter.outputs.javascript }}
     steps:
       - uses: actions/checkout@v4
       - uses: dorny/paths-filter@v3
         id: filter
         with:
           filters: |
             javascript:
-              - '**/*.js'
-              - '**/*.json'
-              - '**/*.mjs'
-              - '**/*.cjs'
-            release_related_files:
-              - 'NEWS.md'
-              - 'changelog.json'
-              - 'package.json'
-              - 'package-lock.json'
+              - 'api.js'
+              - 'esm-loader.mjs'
+              - 'index.js'
+              - 'stub_api.js'
+              - 'lib/**/*.{js,json,mjs,cjs}'
+              - 'test/**/*.{js,json,mjs,cjs}'
+
+  foo:
+    runs-on: ubuntu-latest
+    needs:
+      - should_run
+    steps:
+      - env:
+          FOO: ${{ needs.should_run.outputs.javascript_changed }}
+        run: |
+          echo "${FOO}"
 
   lint:
     needs:
       - should_run
-    if: needs.should_run.outputs.release_files_changed == 'false'
-      || needs.should_run.outputs.javascript_changed == 'true'
+    if: needs.should_run.outputs.javascript_changed == 'true'
     runs-on: ubuntu-latest
 
     strategy:
@@ -58,8 +63,7 @@ jobs:
   ci:
     needs:
       - should_run
-    if: needs.should_run.outputs.release_files_changed == 'false'
-      || needs.should_run.outputs.javascript_changed == 'true'
+    if: needs.should_run.outputs.javascript_changed == 'true'
     runs-on: ubuntu-latest
 
     strategy:
@@ -81,8 +85,7 @@ jobs:
   unit:
     needs:
       - should_run
-    if: needs.should_run.outputs.release_files_changed == 'false'
-      || needs.should_run.outputs.javascript_changed == 'true'
+    if: needs.should_run.outputs.javascript_changed == 'true'
     runs-on: ubuntu-latest
 
     strategy:
@@ -109,8 +112,7 @@ jobs:
   integration:
     needs:
       - should_run
-    if: needs.should_run.outputs.release_files_changed == 'false'
-      || needs.should_run.outputs.javascript_changed == 'true'
+    if: needs.should_run.outputs.javascript_changed == 'true'
     runs-on: ubuntu-latest
 
     env:
@@ -149,8 +151,7 @@ jobs:
   versioned-internal:
     needs:
       - should_run
-    if: needs.should_run.outputs.release_files_changed == 'false'
-      || needs.should_run.outputs.javascript_changed == 'true'
+    if: needs.should_run.outputs.javascript_changed == 'true'
     runs-on: ${{ github.ref == 'refs/heads/main' && vars.NR_RUNNER || 'ubuntu-latest' }}
 
     strategy:
@@ -199,8 +200,7 @@ jobs:
   versioned-external:
     needs:
       - should_run
-    if: needs.should_run.outputs.release_files_changed == 'false'
-      || needs.should_run.outputs.javascript_changed == 'true'
+    if: needs.should_run.outputs.javascript_changed == 'true'
     runs-on: ${{ github.ref == 'refs/heads/main' && vars.NR_RUNNER || 'ubuntu-latest' }}
 
     strategy:

diff --git a/test/unit/apdex.test.js b/test/unit/apdex.test.js
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+// 'testing'
+
 'use strict'
 const tap = require('tap')
 const ApdexStats = require('../../lib/stats/apdex')