chore(template): accept new copier update

Author: wpk-nist-gov

.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: v0.9.0
+_commit: v0.9.0-6-gf86ad81
 _src_path: https://github.com/usnistgov/cookiecutter-nist-python.git
 command_line_interface: typer
 conda_channel: conda-forge

.github/workflows/update-copier.yml

@@ -3,6 +3,12 @@ on:
   schedule:
     - cron: "0 2 * * 1" # Every Monday at 2am
   workflow_dispatch:
+    inputs:
+      automerge:
+        description: "enable automerge"
+        required: false
+        type: boolean
+        default: false
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -14,6 +20,7 @@ permissions:
 
 env:
   COPIER_OPTIONS: "--trust -A -r main -c 3"
+  AUTOMERGE: "false"
 
 jobs:
   update:
@@ -76,7 +83,7 @@ jobs:
               conflict_message="Resolve conflicts."
               commit_message="$commit_message [skip ci]"
             # check for new untracked files
-            elif [ -n "$(git status --untracked-files=normal --porcelain)" ]; then
+            elif [ -n "$(git status --porcelain | grep '^??')" ]; then
               automergeable='false'
             fi
           fi
@@ -140,7 +147,8 @@ jobs:
 
       - name: automerge
         if:
-          ${{ steps.cpr.outputs.pull-request-number &&
+          ${{ (inputs.automerge || env.AUTOMERGE == 'true') &&
+          steps.cpr.outputs.pull-request-number &&
           steps.check.outputs.conflict_message == ''  &&
           steps.check.outputs.automergeable == 'true' }}
         env: