Update SwiftLint plugin to use `environment` property on `Process` #207

JosephDuffy · 2019-03-07T21:57:52Z

This was failing when the system shell is fish (because fish requires env to be prepended). Using the environment property on Process makes this shell-agnostic

This was failing when the system shell is fish. Using the `environment` property on `Process` makes this shell-agnostic

JosephDuffy · 2019-03-07T21:58:23Z

Tests/RunnerLibTests/GetDangerJSPathTests.swift

 import Logger
 @testable import RunnerLib
+import XCTest


These changes seem to have been done during the pre-commit hook

JosephDuffy · 2019-03-07T21:58:33Z

Tests/RunnerLibTests/XCTestManifests.swift

@@ -42,6 +42,13 @@ extension DangerfilePathFinderTests {
    ]
 }

+extension GetDangerJSPathTests {


These changes seem to have been done during the pre-commit hook

JosephDuffy · 2019-03-07T22:18:05Z

This was working locally but isn't in CI. Will fix!

f-meloni

Looks good can you please update the changelog?

f-meloni

Looks there are some problems with CI on linux

JosephDuffy · 2019-03-07T23:03:00Z

Looks good can you please update the changelog?

Thanks! I've updated the changelog with the change

JosephDuffy · 2019-03-07T23:04:21Z

Looks there are some problems with CI on linux

I can't immediately see what's going wrong here, I'll look in to it further

Maybe these were causing the linux builds to fail on CI? The reason isn’t obvious to me

This was done during the pre-commit hook but didn’t seem to be committed

orta · 2019-03-08T11:48:47Z

This is very weird:

danger:runDangerSubprocess Passed DSL in via STDIN +0ms
The program 'swift' is currently not installed. To run 'swift' please ask your administrator to install the package 'python-swiftclient'
Ran with: /tmp/_tmp_dangerfile.swift /tmp/danger-dsl.json /tmp/danger-response.json
Decoding the DSL into Swift types
Setting up to dump results
Executing `swift run swiftlint lint --quiet --reporter json --use-script-input-files --force-exclude` with environment variables ["SCRIPT_INPUT_FILE_1": "Sources/Danger/Plugins/SwiftLint/ShellExecutor.swift", "SCRIPT_INPUT_FILE_2": "Sources/Danger/Plugins/SwiftLint/SwiftLint.swift", "SCRIPT_INPUT_FILE_COUNT": "3", "SCRIPT_INPUT_FILE_0": "Sources/Danger-Swift/Fake.swift"]
Sending results back to Danger

f-meloni · 2019-03-08T11:55:43Z

Could it be related to the env override? Maybe it has to be merged with the current process env?
(The env of a process is inherited from the current process)
Will make a try to see if it fixes it

f-meloni · 2019-03-08T12:23:28Z

Ok fixed! 🎉
Can you please use the same logic on spawn, and remove the test logs? And we are ready to merge :)

JosephDuffy · 2019-03-08T13:15:35Z

Could it be related to the env override? Maybe it has to be merged with the current process env?
(The env of a process is inherited from the current process)
Will make a try to see if it fixes it

Ah I hadn't thought of this, good catch!

I should have a chance to clean this up tonight/tomorrow.

Thanks for the fix 😄

This file is in a cycle of changes, I think thanks to SwiftLint It seems to want to end with a new line, but also not start with whitespace. This comment both explains the file and fixes the SwiftLint issue

DangerCI · 2019-03-08T13:31:39Z

	Warnings
⚠️	Sources/Danger/Plugins/SwiftLint/ShellExecutor.swift#L3 - TODOs should be resolved (Get a logger into here this is...). (`todo`)

Generated by 🚫 Danger Swift against ebb5189

JosephDuffy · 2019-03-08T13:31:44Z

Sources/Danger/Plugins/SwiftLint/ShellExecutor.swift

                      arguments.joined(separator: " ")].filter { !$0.isEmpty }.joined(separator: " ")
-        print("Executing \(script)")
+        print("Executing `\(script)` with environment variables \(environmentVariables)")


@f-meloni this was here before, but I have updated it to include the environment variables now.

Should I remove this or keep it?

If I keep I'll update it to print the merged envs and also add it to the spawn function below?

Yes, I like it :)

`print` statement was also removed. This may we re-added in response to https://github.com/danger/swift/pull/207/files#r263776454

f-meloni · 2019-03-08T15:02:23Z

Sources/Danger-Swift/Fake.swift

@@ -0,0 +1 @@
+// An empty file to allow the DangerDependencies target to build via SPM


f-meloni · 2019-03-08T16:55:03Z

merge on green

Update SwiftLint plugin to use environment

379ad33

This was failing when the system shell is fish. Using the `environment` property on `Process` makes this shell-agnostic

JosephDuffy commented Mar 7, 2019

View reviewed changes

Remove extra quotes around SwiftLint input files

a46b394

f-meloni approved these changes Mar 7, 2019

View reviewed changes

Add fix for SwiftLint with fish to changelog

651b13b

f-meloni requested changes Mar 7, 2019

View reviewed changes

JosephDuffy added 4 commits March 7, 2019 23:30

Fix SwiftLint warnings

adc5c50

Maybe these were causing the linux builds to fail on CI? The reason isn’t obvious to me

Update print statement to aid debugging

a287a9d

Remove leading whitespace

5a002a4

This was done during the pre-commit hook but didn’t seem to be committed

Add further debugging for Linux CI

a46fe99

Merge environmentVariables with process variables

3d795fd

JosephDuffy added 3 commits March 8, 2019 13:21

Revert Travis Linux debugging changes

4342dcd

Remove swiftlint:disable comment

0456c44

Add comment to Fake.swift

d3759d7

This file is in a cycle of changes, I think thanks to SwiftLint It seems to want to end with a new line, but also not start with whitespace. This comment both explains the file and fixes the SwiftLint issue

JosephDuffy commented Mar 8, 2019

View reviewed changes

Refactor logic for created task to function

228644c

`print` statement was also removed. This may we re-added in response to https://github.com/danger/swift/pull/207/files#r263776454

f-meloni reviewed Mar 8, 2019

View reviewed changes

Sources/Danger-Swift/Fake.swift

@@ -0,0 +1 @@

// An empty file to allow the DangerDependencies target to build via SPM

Copy link

Member

f-meloni Mar 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks :)

Swiftlint fix

ebb5189

f-meloni approved these changes Mar 8, 2019

View reviewed changes

peril-staging bot added the Merge On Green label Mar 8, 2019

peril-staging bot merged commit db863cd into danger:master Mar 8, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update SwiftLint plugin to use `environment` property on `Process` #207

Update SwiftLint plugin to use `environment` property on `Process` #207

JosephDuffy commented Mar 7, 2019

JosephDuffy Mar 7, 2019

JosephDuffy Mar 7, 2019

JosephDuffy commented Mar 7, 2019

f-meloni left a comment

f-meloni left a comment

JosephDuffy commented Mar 7, 2019

JosephDuffy commented Mar 7, 2019

orta commented Mar 8, 2019

f-meloni commented Mar 8, 2019 •

edited

Loading

f-meloni commented Mar 8, 2019

JosephDuffy commented Mar 8, 2019

DangerCI commented Mar 8, 2019 •

edited

Loading

JosephDuffy Mar 8, 2019

f-meloni Mar 8, 2019

f-meloni Mar 8, 2019

f-meloni commented Mar 8, 2019

		@@ -0,0 +1 @@
		// An empty file to allow the DangerDependencies target to build via SPM

Update SwiftLint plugin to use environment property on Process #207

Update SwiftLint plugin to use environment property on Process #207

Conversation

JosephDuffy commented Mar 7, 2019

JosephDuffy Mar 7, 2019

Choose a reason for hiding this comment

JosephDuffy Mar 7, 2019

Choose a reason for hiding this comment

JosephDuffy commented Mar 7, 2019

f-meloni left a comment

Choose a reason for hiding this comment

f-meloni left a comment

Choose a reason for hiding this comment

JosephDuffy commented Mar 7, 2019

JosephDuffy commented Mar 7, 2019

orta commented Mar 8, 2019

f-meloni commented Mar 8, 2019 • edited Loading

f-meloni commented Mar 8, 2019

JosephDuffy commented Mar 8, 2019

DangerCI commented Mar 8, 2019 • edited Loading

JosephDuffy Mar 8, 2019

Choose a reason for hiding this comment

f-meloni Mar 8, 2019

Choose a reason for hiding this comment

f-meloni Mar 8, 2019

Choose a reason for hiding this comment

f-meloni commented Mar 8, 2019

Update SwiftLint plugin to use `environment` property on `Process` #207

Update SwiftLint plugin to use `environment` property on `Process` #207

f-meloni commented Mar 8, 2019 •

edited

Loading

DangerCI commented Mar 8, 2019 •

edited

Loading