diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8257eacdfa5..4a1ceae1ca2 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,8 +11,8 @@ on: branches: - import-2.1.x paths: - - 'config/**' - - 'bin/mfconfig' + - 'config/**/*' + - 'bin/mfconfig' jobs: deploy: diff --git a/bin/mfconfig b/bin/mfconfig index 537eda305b3..5cd04baf012 100755 --- a/bin/mfconfig +++ b/bin/mfconfig @@ -14,6 +14,7 @@ # - Add Marlin config files, but reset all to defaults. # - Commit this so changes will be clear in following commits. # - Add changed Marlin config files and commit. +# - Add remaining files such as README, etc., and commit. # # manual - Import changes from a local Marlin folder, then init. # - Replace 'default' configs with your local Marlin configs. @@ -24,13 +25,13 @@ # - Add a #define CONFIG_EXAMPLES_DIR to each Configuration*.h file. # # CI - Run in CI mode, using the current folder as the repo. -# - For GitHub Actions to update the Configurations repo. +# - Used by GitHub Actions to update the Configurations repo. # import os, sys, subprocess, shutil, datetime, tempfile from pathlib import Path # Set to 1 for extra debug commits (no deployment) -DEBUG = 0 +DEBUG = 1 # Get the shell arguments into ACTION, IMPORT, and EXPORT ACTION = sys.argv[1] if len(sys.argv) > 1 else 'manual' @@ -70,11 +71,7 @@ if not CONFIGREPO.exists(): # Run git within CONFIGREPO GITSTDERR = None if DEBUG else subprocess.DEVNULL def git(etc): - if DEBUG: - print(f"> git {' '.join(etc)}") - if etc[0] == "push": - info("*** DRY RUN ***") - return subprocess.run(["echo"]) + if DEBUG: print(f"> git {' '.join(etc)}") return subprocess.run(["git"] + etc, cwd=CONFIGREPO, stdout=subprocess.PIPE, stderr=GITSTDERR) # Get the current branch name @@ -93,8 +90,8 @@ def gitbd(name): return git(["branch", "-D", name]).stdout def changes(): return git(["status", "--porcelain"]).stdout.decode().strip() # Configure git user -git(["config", "user.email", "thinkyhead@users.noreply.github.com"]) -git(["config", "user.name", "Scott Lahteine"]) +git(["config", "user.email", "\"thinkyhead@users.noreply.github.com\""]) +git(["config", "user.name", "\"Scott Lahteine\""]) # Stash uncommitted changes at the destination? if changes(): diff --git a/config/examples/3DFabXYZ/Migbot/Configuration.h b/config/examples/3DFabXYZ/Migbot/Configuration.h index 78a32763159..8c9d167bf57 100644 --- a/config/examples/3DFabXYZ/Migbot/Configuration.h +++ b/config/examples/3DFabXYZ/Migbot/Configuration.h @@ -20,6 +20,7 @@ * */ #pragma once + #error "Don't build with import-2.1.x configurations!" #error "Use the 'bugfix...' or 'release...' configurations matching your Marlin version."