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

chore: Only verify Jdk 9 classes on jdk 11. #1078

Merged
merged 2 commits into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions .github/workflows/nightly-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,19 +181,15 @@ jobs:
"+~ ${{ matrix.scalaVersion }} publishLocal publishM2"
- name: Install scala-cli
if: ${{ contains('11,17,21', matrix.javaVersion) }}
if: ${{ matrix.javaVersion == 11 }}
run: |-
curl -sS "https://virtuslab.github.io/scala-cli-packages/KEY.gpg" | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/scala-cli.gpg 2>/dev/null
sudo curl -s --compressed -o /etc/apt/sources.list.d/scala_cli_packages.list "https://virtuslab.github.io/scala-cli-packages/debian/scala_cli_packages.list"
sudo apt update
sudo apt install scala-cli
- name: Use Scala-CLI to verify jdk 9 classes
if: ${{ contains('11,17,21', matrix.javaVersion) }}
if: ${{ matrix.javaVersion == 11 }}
run: |-
scala-cli --version
echo "Starting verification with Scala-CLI"
scala-cli stream/target/scala-cli/VerifyJDK9Classes.sc && echo "Verification successful" || (
echo "Error when VerifyJDK9Classes"
exit 1
)
chmod +x .github/workflows/verify-jdk9-classes.sh
.github/workflows/verify-jdk9-classes.sh
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
.github/workflows/verify-jdk9-classes.sh
sh github/workflows/verify-jdk9-classes.sh

Copy link
Member Author

Choose a reason for hiding this comment

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

Let's keep it for now, otherwise I have to revaluation it.

18 changes: 18 additions & 0 deletions .github/workflows/verify-jdk9-classes.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash

echo "Checking Scala CLI version..."
scala-cli --version

echo "Starting verification with Scala-CLI..."

for file in stream/target/scala-cli/*.sc; do
Copy link
Member

Choose a reason for hiding this comment

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

Cool, has expandable capability.

echo "Starting verification for with file: $file."
if scala-cli "$file" ; then
echo "Verification successful for $file."
else
echo "Error when verifying $file."
exit 1
fi
done

echo "All verifications successful."
16 changes: 7 additions & 9 deletions project/VerifyJDK9Classes.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,23 @@ object VerifyJDK9Classes {
lazy val settings: Seq[Setting[_]] = inConfig(Compile) {
Seq {
sourceGenerators += {
generateAndWriteScalaCLIScript(
target,
_ / "scala-cli" / "VerifyJDK9Classes.sc")
generateAndWriteScalaCLIScript(target)
Copy link
Member

Choose a reason for hiding this comment

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

More readable!

}
}
}

def generateAndWriteScalaCLIScript(dir: SettingKey[File], locate: File => File): Def.Initialize[Task[Seq[sbt.File]]] =
def generateAndWriteScalaCLIScript(dir: SettingKey[File]): Def.Initialize[Task[Seq[sbt.File]]] =
Def.task[Seq[File]] {
val script = generateScalaCLIScript(version.value)
val file = locate(dir.value)
val binaryVersion = scalaBinaryVersion.value
val script = generateScalaCLIScript(version.value, binaryVersion)
val file = dir.value / "scala-cli" / s"VerifyJDK9Classes-${binaryVersion}.sc"
val content = script.stripMargin.format(version.value)
if (!file.exists || IO.read(file) != content) IO.write(file, content)
// the generated file is not used.
Nil
}

private def generateScalaCLIScript(version: String): String =
private def generateScalaCLIScript(version: String, scalaBinaryVersion: String): String =
s"""
|/*
| * Licensed to the Apache Software Foundation (ASF) under one or more
Expand All @@ -57,9 +56,8 @@ object VerifyJDK9Classes {
| * See the License for the specific language governing permissions and
| * limitations under the License.
| */
|//> using scala 2.13
|//> using scala ${scalaBinaryVersion}
|//> using dep "org.apache.pekko::pekko-stream:${version}"
|////> using jvm 11
|object VerifyJDK9Classes {
| def main(args: Array[String]): Unit = {
| import org.apache.pekko.actor.ActorSystem
Expand Down
Loading