-
Notifications
You must be signed in to change notification settings - Fork 94
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Restrict installation logging to workflow srcdir #4423
Restrict installation logging to workflow srcdir #4423
Conversation
0d20c13
to
c772965
Compare
c772965
to
56ee05d
Compare
@wxtim your new tests pass locally for me, but @oliver-sanders's example on #4220 fails with this diff in ┬─[oliverh@niwa-1007885:~/c/myproject]─[12:31:09]─[I]─[G:master]
╰─>$ pwd
/home/oliverh/cylc-src/myproject
┬─[oliverh@niwa-1007885:~/c/myproject]─[12:31:11]─[I]─[G:master]
╰─>$ git diff
diff --git a/build/workflow/flow.cylc b/build/workflow/flow.cylc
index e69de29..907b308 100644
--- a/build/workflow/flow.cylc
+++ b/build/workflow/flow.cylc
@@ -0,0 +1 @@
+blah
diff --git a/src/a b/src/a
index e69de29..907b308 100644
--- a/src/a
+++ b/src/a
@@ -0,0 +1 @@
+blah
diff --git a/test-workflow/flow.cylc b/test-workflow/flow.cylc
index e69de29..907b308 100644
--- a/test-workflow/flow.cylc
+++ b/test-workflow/flow.cylc
@@ -0,0 +1 @@
+blah Result:
It works on master, albeit with the out-of-src-dir diffs logged. |
Looks like your change assumes an absolute source path on the |
…tion-logging-to-workflow-srcdir * upstream/master: (96 commits) Update cylc/flow/cfgspec/workflow.py clean up interim obselete message fix flake8-simplify failures caused by recently added checks. (cylc#4420) Fix Change log Add test and raise error on src dir move change log Source symlink fix publish pending flag handle orphan tasks post reload Create window elements & load jobs from DB Deltas batched post reload Fix a doctest. Add colour to GH Actions pytest log Address review feedback. Type annotations for timer. Correct func test timeouts. Fix test. Add Cylc 7 back-compat func tests. Add stall restart func test. Func test for workflow timeout. ...
I think that I have fixed this. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using master
, after re-creating the scenario described in the issue linked (also git add
and commit, then modify a file), uncommitted.diff
:
# Auto-generated diff of uncommitted changes in the Cylc workflow repository:
# myproject/test-workflow
diff --git a/build/workflow/flow.cylc b/build/workflow/flow.cylc
index 56f0067..0275ba1 100644
--- a/build/workflow/flow.cylc
+++ b/build/workflow/flow.cylc
@@ -1,3 +1,7 @@
+
+
+
+
[scheduling]
cycling mode = integer
initial cycle point = 1
Using this branch, uncommitted.diff
:
# Auto-generated diff of uncommitted changes in the Cylc workflow repository:
# myproject/test-workflow
So not displaying the changes in the other directory 🎉 ! vcs.conf
still shows the changes, but I think that's OK:
version control system = "git"
repository version = "81f03d9-dirty"
commit = "81f03d9c7c83399a44216e8db3272b7475a46afa"
working copy root path = "myproject/test-workflow"
status = """
M ../build/workflow/flow.cylc
"""
+1
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Noice 💯
These changes close #4220
This is a small change with no associated Issue.
Requirements check-list
CONTRIBUTING.md
and added my name as a Code Contributor.setup.py
andconda-environment.yml
.