From 845750a9c833b4fae2aa627744e2a29abbbbdeaf Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 20 Apr 2021 00:26:06 -0400 Subject: [PATCH 1/3] ci: also build on pushes to main --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dfa08abb..797469aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,9 @@ name: CI on: push: - branches: [ development ] + branches: + - main + - development tags: [ "**" ] pull_request: branches: [ "**" ] From 741f4db43abea8acbf04aefd0cce5179ca2d2474 Mon Sep 17 00:00:00 2001 From: BasilHorowt <82249557+BasilHorowt@users.noreply.github.com> Date: Tue, 20 Apr 2021 23:19:02 -0700 Subject: [PATCH 2/3] Update process detection logic to work on OSX the arguments passed to this function looked like this on OSX: `['/Library/Frameworks/Python.framework/Versions/3.9/Resources/Python.app/Contents/MacOS/Python', '/Users/chia/chia-blockchain/venv/bin/chia', 'plots', 'create', '-k', '32', '-r', '2', '-u', '128', '-b', '4608', '-t', '/Volumes/plotting2tb', '-d', '/Volumes/16tb']` The first argument did not contain a lowercase 'python', so we can lowercase the string before comparison to make the check work more generally. --- src/plotman/job.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plotman/job.py b/src/plotman/job.py index 6314d168..0f410d06 100644 --- a/src/plotman/job.py +++ b/src/plotman/job.py @@ -27,7 +27,7 @@ def job_phases_for_dstdir(d, all_jobs): def is_plotting_cmdline(cmdline): return ( len(cmdline) >= 4 - and 'python' in cmdline[0] + and 'python' in cmdline[0].lower() and cmdline[1].endswith('/chia') and 'plots' == cmdline[2] and 'create' == cmdline[3] From 6ad536d0f482a92292a8fad22411e83bc3cc2f68 Mon Sep 17 00:00:00 2001 From: BasilHorowt <82249557+BasilHorowt@users.noreply.github.com> Date: Tue, 20 Apr 2021 23:25:18 -0700 Subject: [PATCH 3/3] fixup! Update process detection logic to work on OSX --- src/plotman/job.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plotman/job.py b/src/plotman/job.py index 0f410d06..5a34ce60 100644 --- a/src/plotman/job.py +++ b/src/plotman/job.py @@ -106,7 +106,7 @@ def __init__(self, proc, logroot): # Parse command line args args = self.proc.cmdline() assert len(args) > 4 - assert 'python' in args[0] + assert 'python' in args[0].lower() assert 'chia' in args[1] assert 'plots' == args[2] assert 'create' == args[3]