Merge upstream changes #131
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This pr changes the way we do releases and migrates us away from the forked sbt-release-early that's no longer maintained and is also bringing in some old versions of scala-xml which will be problematic when we try to update our sbt stuff. Plus this simplifies the release a little bit. The one difference is that we'll now be publishing actual `-SNAPSHOT` into sonatype snapshots.
This needed to be done after the work on moving to sbt-ci-release due to scala-xml conflicts. Supercedes scalacenter#1925 Supercedes scalacenter#1899
refactor(ci): migrate to sbt-ci-release
fix(ci): ensure release sbt version is the same as the build
This was a bit of a rabbit hole, but I just went with it. With the changes to sbt-ci-release, _somehow_ the graal native image generation was failing on windows. In order to combat that this pr makes some changes to CI and to the args we're using with Graal. I'll outline the changes below. - Migrate to `graalvm/setup-graalvm` for the graal jobs. This is necessary if we want to use the newer graal versions. When I tried with `setup-scala` I got jabba erros that what I was looking for doesn't exist. Plus `setup-scala` isn't _really_ worked on anymore, so migrating away is preferable. Plus, when using `setup-graalvm` it's easy to get things like the `native-image` command on all platforms. - Bump to 22.3.0. I tried to just bump slightly, but there is a bug in 22.1.0 on windows that I hit on oracle/graal#4502. It's fixed in the newer ones, so I just bumped up. - Use `actions/setup-java` instead of `setup-scala` for jvm tests. Same reason as above with maintenance, but also built-in sbt cache. For now we're still doing a lot on 11 (where the graal stuff is on 17) but I'm trying to not change this too much for now until I get everything green and releasing. Then I'll address that. - Move `publish-binaries-windows` into `publish-binaries`. Now that we are using `setup-graalvm` it's trivial to just keep these together, using `sbt` and just call it a day. No need for two separate ones. - Remove the windows-specific `graalVMNativeImageCommand`. Again, now that we're using `setup-graalvm` we easily have the `native-image` command on the PATH so we don't need to worry about all this extra stuff. - Change a few flags: - `--no-server` wasn't valid it seemed as we were getting a message on every run that it wasn't recognized and ignored. - `-H:EnableUrlProtocols` no just uses `--enable-url-protocols`. Apparently it's frowned upon to use the `-H` stuff since it's internal, so this was just a bit of cleaning up. We do have a couple others, but there doesn't seem to be alternatives so I left them as is. - `--allow-incomlete-classpath` This is the default now, so no need to have it. You can see a green build for all 3 os's [here in my fork](https://github.com/ckipp01/bloop/actions/runs/3787821939/jobs/6439973910). But let's see how all the other jobs go.
refactor(ci): update graal release infrastructure
This pr is just some general cleanup. - Moves to slash syntax in sbt - Removes some unused sbt things - Moves some sbt setting inline if they are only used once
…se.jgit-6.4.0.202211300538-r build(deps): Update org.eclipse.jgit, ... from 5.13.1.202206130422-r to 6.4.0.202211300538-r
chore: remove the gitter icon in the readme
refactor(build): get rid of build warnings and unused things
This will get rid of some of the warnings we're seeing in CI
chore(ci): try to bump node to lts
build(deps): Update zt-zip from 1.13 to 1.15
refactor(build): clean up the plugins file
build(deps): Update sbt, test-agent from 1.8.0 to 1.8.1
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](json5/json5@v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
…nd_yarn/website/json5-1.0.2 build(deps): bump json5 from 1.0.1 to 1.0.2 in /website
build(deps): Update sbt, test-agent from 1.8.1 to 1.8.2
Conflicts: .github/workflows/ci.yml
Conflicts: project/build.sbt
Conflicts: build.sbt
Conflicts: frontend/src/test/scala/bloop/ScalaVersionsSpec.scala frontend/src/test/scala/bloop/util/TestUtil.scala
Conflicts: integrations/sbt-bloop/src/main/scala/bloop/integrations/sbt/SbtBloop.scala
Conflicts: project/Dependencies.scala
Conflicts: project/Dependencies.scala
Conflicts: project/build.sbt
Conflicts: project/build.sbt
Conflicts: integrations/sbt-bloop/src/main/scala/bloop/integrations/sbt/SbtBloop.scala
Conflicts: docs-gen/src/main/scala/bloop/docs/ReleasesModifier.scala docs-gen/src/main/scala/bloop/docs/Sonatype.scala launcher-test/src/test/scala/bloop/launcher/LauncherBaseSuite.scala
Conflicts: project/Dependencies.scala project/build.sbt
Conflicts: project/Dependencies.scala
Conflicts: project/build.sbt
Conflicts: .github/workflows/ci.yml
Conflicts: project/Dependencies.scala project/build.sbt
Conflicts: project/Dependencies.scala
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.