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

[Test Only][BUILD] Upgrade sbt to 1.10.5 #48972

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from

Conversation

panbingkun
Copy link
Contributor

@panbingkun panbingkun commented Nov 26, 2024

What changes were proposed in this pull request?

The pr aims to upgrade sbt from 1.9.3 to 1.10.5.

Why are the changes needed?

Does this PR introduce any user-facing change?

No.

How was this patch tested?

Pass GA.

Was this patch authored or co-authored using generative AI tooling?

No.

@github-actions github-actions bot added the BUILD label Nov 26, 2024
@@ -24,6 +24,9 @@ set -e
FWDIR="$(cd "`dirname "$0"`"/..; pwd)"
cd "$FWDIR"

# Skip maven local resolver.
export SKIP_LOCAL_M2=true
Copy link
Contributor Author

@panbingkun panbingkun Nov 27, 2024

Choose a reason for hiding this comment

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

We make dev/mima ignore the maven local cache directly, so that the environment and process that all tests depend on are consistent in both GA and local.

@panbingkun
Copy link
Contributor Author

By using environment variables SKIP_LOCAL_M2, the logic of skip maven local resolver is limited to dev/mima only, and the logic executed on GA and on local is already consistent.

Based on this discussion coursier/coursier#2942 (comment), coursier (sbt relies on it) will not solve this problem in the short term.

@LuciferYang @dongjoon-hyun Can we upgrade sbt through this workaround?

@panbingkun panbingkun changed the title [Test Only][BUILD] Test sbt 1.10.5 [Test Only][BUILD] Upgrade sbt to 1.10.5 Nov 28, 2024
Resolver.file("ivyLocal", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns)
),
DefaultMavenRepository) ++
{ if (sys.env.contains("SKIP_LOCAL_M2")) Nil else Seq(Resolver.mavenLocal) } :+
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a way to exclude Resolver.mavenLocal when it is explicitly known that the sbt task being executed is mimaReportBinaryIssues

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants