ci: merge and improve ci test workflows

privacy-scaling-explorations · May 14, 2024 · 1b7a34c · 1b7a34c
1 parent 370fd79
commit 1b7a34c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 52 deletions.
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
diff --git a/.github/workflows/pull-requests.yml → .github/workflows/tests.yml b/.github/workflows/pull-requests.yml → .github/workflows/tests.yml
@@ -1,6 +1,9 @@
-name: pull-requests
+name: tests
 
 on:
+    push:
+        branches:
+            - main
     pull_request:
 
 concurrency:
@@ -21,22 +24,22 @@ jobs:
                   node-version: "20"
                   cache: yarn
 
-            - name: Install Nargo
-              uses: noir-lang/noirup@v0.1.3
-              with:
-                  toolchain: 0.26.0
-
             - name: Install dependencies
               run: yarn
 
             - name: Get changed files
               id: changed-files
               uses: tj-actions/changed-files@v44
               with:
-                  files_yaml: |
-                      circuits:
-                        - packages/**/*.{nr,toml}
+                  files: |
+                      packages/**/*.{nr,toml}
+
+            - if: steps.changed-files.outputs.any_changed == 'true'
+              name: Install Nargo
+              uses: noir-lang/noirup@v0.1.3
+              with:
+                  toolchain: 0.26.0
 
-            - if: steps.changed-files.outputs.circuits_any_changed == 'true'
+            - if: steps.changed-files.outputs.any_changed == 'true'
               name: Test circuits
               run: yarn test
diff --git a/README.md b/README.md
@@ -12,8 +12,8 @@
     <a href="https://github.com/privacy-scaling-explorations/zk-kit.noir/blob/main/LICENSE">
         <img alt="Github license" src="https://img.shields.io/github/license/privacy-scaling-explorations/zk-kit.noir.svg?style=flat-square">
     </a>
-    <a href="https://github.com/privacy-scaling-explorations/zk-kit.noir/actions?query=workflow%3Aproduction">
-        <img alt="GitHub Workflow test" src="https://img.shields.io/github/actions/workflow/status/privacy-scaling-explorations/zk-kit.noir/production.yml?branch=main&label=test&style=flat-square&logo=github">
+    <a href="https://github.com/privacy-scaling-explorations/zk-kit.noir/actions?query=workflow%3Atests">
+        <img alt="GitHub Workflow test" src="https://img.shields.io/github/actions/workflow/status/privacy-scaling-explorations/zk-kit.noir/tests.yml?branch=main&label=test&style=flat-square&logo=github">
     </a>
     <a href="https://prettier.io/">
         <img alt="Code style prettier" src="https://img.shields.io/badge/code%20style-prettier-f8bc45?style=flat-square&logo=prettier">