Fix merge conflicts with main

DeterminateSystems · May 22, 2024 · db2913f · db2913f
2 parents e8cf2e7 + d87f573
commit db2913f
Show file tree

Hide file tree

Showing 7 changed files with 375 additions and 308 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -32,6 +32,8 @@ jobs:
       - uses: actions/checkout@v4
       - name: Check flake.lock
         uses: ./
+        with:
+          _internal-strict-mode: true
 
   run-x86_64-linux-dirty:
     name: Run x86_64 Linux (dirty)
@@ -43,6 +45,7 @@ jobs:
         uses: ./
         with:
           flake-lock-path: flake.dirty.lock
+          _internal-strict-mode: true
 
   run-x86_64-darwin-clean:
     name: Run x86_64 Darwin (clean)
@@ -52,6 +55,8 @@ jobs:
       - uses: actions/checkout@v4
       - name: Check flake.lock
         uses: ./
+        with:
+          _internal-strict-mode: true
 
   run-x86_64-darwin-dirty:
     name: Run x86_64 Darwin (dirty)
@@ -63,3 +68,4 @@ jobs:
         uses: ./
         with:
           flake-lock-path: flake.dirty.lock
+          _internal-strict-mode: true
diff --git a/action.yml b/action.yml
@@ -47,6 +47,9 @@ inputs:
     description: |
       Run a version of flake-checker from somewhere already on disk. Intended only for testing the Action.
     required: false
+  _internal-strict-mode:
+    description: Whether to fail when any errors are thrown. Used only to test the Action; do not set this in your own workflows.
+    default: false
 runs:
   using: "node20"
   main: "dist/index.js"