Skip to content
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

[FLINK-27317][build] Don't fork build for attaching sources #19524

Merged
merged 3 commits into from
Apr 20, 2022

Conversation

zentol
Copy link
Contributor

@zentol zentol commented Apr 20, 2022

No description provided.

@flinkbot
Copy link
Collaborator

flinkbot commented Apr 20, 2022

CI report:

Bot commands The @flinkbot bot supports the following commands:
  • @flinkbot run azure re-run the last Azure build

Copy link
Member

@dmvk dmvk left a comment

Choose a reason for hiding this comment

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

This is some dark working directory magic. :) How about making the .scalafmt.conf path relative to the base directory instead? Are there any other consequences of using -no-fork?

eg.

index ff31c8996bb..ad805f54d6d 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -146,7 +146,7 @@ under the License.
 					<scala>
 						<scalafmt>
 							<version>${spotless.scalafmt.version}</version>
-							<file>../.scalafmt.conf</file>
+							<file>${project.basedir}/../.scalafmt.conf</file>
 						</scalafmt>
 						<licenseHeader>
 							<content>${spotless.license.header}</content>

@@ -1224,12 +1224,12 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version><!--$NO-MVN-MAN-VER$-->
Copy link
Member

Choose a reason for hiding this comment

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

is there any particular reason for the upgrade?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No; it just felt like a good opportunity to do so since we're looking at the plugin anyway.

@zentol
Copy link
Contributor Author

zentol commented Apr 20, 2022

Using ${project.basedir} is a good idea. I'm not aware of any downsides in using -no-fork.

@zentol
Copy link
Contributor Author

zentol commented Apr 20, 2022

I would use the -no-fork goal though in any case because it saves some time (and is less "magical").

Copy link
Member

@dmvk dmvk left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for the fix @zentol! Good job.

@zentol
Copy link
Contributor Author

zentol commented Apr 20, 2022

@flinkbot run azure

1 similar comment
@zentol
Copy link
Contributor Author

zentol commented Apr 20, 2022

@flinkbot run azure

@zentol zentol merged commit 6d26587 into apache:master Apr 20, 2022
@zentol zentol deleted the 27317 branch April 20, 2022 20:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants