Skip to content

Commit

Permalink
<<DEPLOY TESTING>>
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Sep 18, 2024
1 parent d2c9ede commit 782bc68
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ on:
branches:
- import-2.1.x
paths:
- 'config/**'
- 'bin/mfconfig'
- 'config/**/*'
- 'bin/mfconfig'

jobs:
deploy:
Expand Down
15 changes: 6 additions & 9 deletions bin/mfconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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'
Expand Down Expand Up @@ -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
Expand All @@ -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", "[email protected]"])
git(["config", "user.name", "Scott Lahteine"])
git(["config", "user.email", "\"[email protected]\""])
git(["config", "user.name", "\"Scott Lahteine\""])

# Stash uncommitted changes at the destination?
if changes():
Expand Down
1 change: 1 addition & 0 deletions config/examples/3DFabXYZ/Migbot/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -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."

Expand Down

0 comments on commit 782bc68

Please sign in to comment.