-
Notifications
You must be signed in to change notification settings - Fork 418
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'version-1.5.x' into known-peers-domain-names
- Loading branch information
Showing
6 changed files
with
94 additions
and
86 deletions.
There are no files selected for viewing
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 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 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 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| name: Publish node and lang jars to Maven Central | ||
|
|
||
| on: | ||
| release: | ||
| types: [published] | ||
|
|
||
| jobs: | ||
| publish-release: | ||
| name: Publish jars | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - id: sbt-version | ||
| run: | | ||
| sbt_version=$(cut -d\" -f2 version.sbt) | ||
| echo "sbt_version=$sbt_version" >> "$GITHUB_OUTPUT" | ||
| - if: ${{ format('v{0}', steps.sbt-version.outputs.sbt_version) != github.ref_name }} | ||
| env: | ||
| SBT_VERSION: ${{ steps.sbt-version.outputs.sbt_version }} | ||
| RELEASE_VERSION: ${{ github.ref_name }} | ||
| run: | | ||
| echo "::error::Release version $RELEASE_VERSION does not match SBT version $SBT_VERSION" | ||
| exit 1 | ||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: 'temurin' | ||
| java-version: '11' | ||
| cache: 'sbt' | ||
| gpg-private-key: ${{ secrets.OSSRH_GPG_KEY }} | ||
| gpg-passphrase: ${{ secrets.OSSRH_GPG_PASSPHRASE }} | ||
| - name: Publish snapshots | ||
| if: ${{ contains(github.event.pull_request.labels.*.name, 'publish-snapshots') }} | ||
| env: | ||
| SONATYPE_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} | ||
| SONATYPE_USERNAME: ${{ secrets.OSSRH_USERNAME }} | ||
| PGP_PASSPHRASE: ${{ secrets.OSSRH_GPG_PASSPHRASE }} | ||
| run: | | ||
| sbt --mem 4096 --batch ";publishSigned;sonatypeBundleRelease" |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| name := "waves" | ||
|
|
||
| enablePlugins( | ||
| RunApplicationSettings, | ||
| JavaServerAppPackaging, | ||
|
|
@@ -20,20 +18,37 @@ javaAgents ++= { | |
| } | ||
| } | ||
|
|
||
| publishTo := sonatypePublishToBundle.value | ||
| publish / skip := false | ||
| homepage := Some(url("https://waves.tech/")) | ||
| developers := List( | ||
| Developer("ismagin", "Ilya Smagin", "[email protected]", url("https://github.com/ismagin")), | ||
| Developer("asayadyan", "Artyom Sayadyan", "[email protected]", url("https://github.com/xrtm000")), | ||
| Developer("mpotanin", "Mike Potanin", "[email protected]", url("https://github.com/potan")), | ||
| Developer("irakitnykh", "Ivan Rakitnykh", "[email protected]", url("https://github.com/mrkraft")), | ||
| Developer("akiselev", "Alexey Kiselev", "[email protected]>", url("https://github.com/alexeykiselev")), | ||
| Developer("phearnot", "Sergey Nazarov", "[email protected]", url("https://github.com/phearnot")), | ||
| Developer("tolsi", "Sergey Tolmachev", "[email protected]", url("https://github.com/tolsi")), | ||
| Developer("vsuharnikov", "Vyatcheslav Suharnikov", "[email protected]", url("https://github.com/vsuharnikov")), | ||
| Developer("ivan-mashonskiy", "Ivan Mashonskii", "[email protected]", url("https://github.com/ivan-mashonskiy")) | ||
| ) | ||
| versionScheme := Some("pvp") | ||
|
|
||
| Compile / packageDoc / publishArtifact := true | ||
| Test / packageDoc / publishArtifact := false | ||
|
|
||
| inConfig(Compile)( | ||
| Seq( | ||
| PB.targets += scalapb.gen(flatPackage = true) -> sourceManaged.value, | ||
| PB.protoSources += PB.externalIncludePath.value, | ||
| PB.generate / includeFilter := { (f: File) => | ||
| (** / "waves" / "*.proto").matches(f.toPath) | ||
| }, | ||
| PB.deleteTargetDirectory := false, | ||
| packageDoc / publishArtifact := false, | ||
| packageSrc / publishArtifact := false | ||
| PB.deleteTargetDirectory := false | ||
| ) | ||
| ) | ||
|
|
||
| inTask(assembly)(CommonSettings.assemblySettings) | ||
| inTask(assembly)(Seq(name := "waves") ++ CommonSettings.assemblySettings) | ||
|
|
||
| // Adds "$lib_dir/*" to app_classpath in the executable file, this is needed for extensions | ||
| scriptClasspath += "*" | ||
|
|
@@ -73,6 +88,7 @@ linuxScriptReplacements += ("network" -> network.value.toString) | |
|
|
||
| inConfig(Universal)( | ||
| Seq( | ||
| packageName := s"waves-${version.value}", | ||
| mappings += (baseDirectory.value / s"waves-sample.conf" -> "doc/waves.conf.sample"), | ||
| javaOptions ++= Seq( | ||
| // -J prefix is required by the bash script | ||
|
|
@@ -93,7 +109,7 @@ inConfig(Linux)( | |
| Seq( | ||
| packageSummary := "Waves node", | ||
| packageDescription := "Waves node", | ||
| name := s"${name.value}${network.value.packageSuffix}", | ||
| name := s"waves${network.value.packageSuffix}", | ||
| normalizedName := name.value, | ||
| packageName := normalizedName.value | ||
| ) | ||
|
|
||
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