Fix workflows (#4020)

phearnot · web-flow · commit 0a6a509abc58 · 2025-12-18T16:14:35.000+03:00
diff --git a/.github/workflows/publish-aptly-repo.yml b/.github/workflows/publish-aptly-repo.yml
@@ -35,7 +35,7 @@ jobs:
           path: ${{ steps.cache-aptly-path.outputs.aptly_toolpath }}
           key: ${{ steps.cache-aptly-path.outputs.aptly_cachekey }}
       - name: Get aptly
-        if: steps.cache-aptly.outputs.cache-hit == 'false'
+        if: steps.cache-aptly.outputs.cache-hit != 'true'
         env:
           APTLY_DOWNLOADPATH: ${{ steps.cache-aptly-path.outputs.aptly_downloadpath }}
           APTLY_TOOLPATH: ${{ steps.cache-aptly-path.outputs.aptly_toolpath }}
diff --git a/.github/workflows/publish-docker-image.yml b/.github/workflows/publish-docker-image.yml
@@ -16,6 +16,8 @@ on:
         type: string
       environment:
         type: string
+      ref:
+        type: string
     secrets:
       DOCKERHUB_USER:
         required: true
@@ -42,9 +44,13 @@ jobs:
       digest: ${{ steps.push.outputs.digest }}
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref }}
       - uses: regclient/actions/regctl-installer@4d6888fcc4842c9630f60ebc91715a45dd9bd7a3
       - uses: proudust/gh-describe@70f72d4f6304ea053cf5a3d71c36211d5acc0c73
         id: ghd
+        with:
+          commit-ish: ${{ inputs.ref || github.sha}}
       - name: Prepare base image and node version
         run: |
           BASE_IMAGE=${{ inputs.base-image }}
@@ -63,12 +69,10 @@ jobs:
         run: sbt --batch -Dproject.version=${{ steps.versions.outputs.node-version }} buildTarballsForDocker
       - name: Extract image name and tags from workflow_call inputs
         if: inputs.raw-docker-tags != ''
+        env:
+          RAW_DOCKER_TAGS: ${{ inputs.raw-docker-tags }}
         run: |
-          {
-            echo 'TAGS<<EOF'
-            echo ${{ inputs.raw-docker-tags }}
-            echo EOF
-          } >> "$GITHUB_ENV"
+          echo "TAGS=$RAW_DOCKER_TAGS" >> "$GITHUB_ENV"
           {
             echo 'IMAGES<<EOF'
             echo ${{ env.IMAGE_NAME }}
@@ -89,12 +93,13 @@ jobs:
         run: |
           {
             echo 'annotations<<EOF'
-            echo org.opencontainers.image.source=https://github.com/${{ github.repository }}/tree/${{ github.sha }}/docker
+            echo org.opencontainers.image.source=https://github.com/${{ github.repository }}/tree/${{ steps.ghd.outputs.sha }}/docker
             echo org.opencontainers.image.licenses=MIT
             echo org.opencontainers.image.description=Waves Node
             echo org.opencontainers.image.base.name=${{ steps.versions.outputs.base-image }}
             echo org.opencontainers.image.base.digest=${{ steps.versions.outputs.base-image-digest }}
             echo org.opencontainers.image.version=${{ steps.versions.outputs.node-version }}
+            echo org.opencontainers.image.revision=${{ steps.ghd.outputs.sha }}
             echo EOF
           } >> "$GITHUB_OUTPUT"
         id: annotations
@@ -117,7 +122,6 @@ jobs:
           images: ${{ env.IMAGES }}
           flavor: latest=${{ contains(inputs.docker-tags, 'latest') }}
           tags: ${{ env.TAGS }}
-          labels: ${{ steps.tag-list.outputs.annotations }}
           annotations: ${{ steps.annotations.outputs.annotations }}
       - uses: docker/build-push-action@v6
         id: push
diff --git a/benchmark/build.sbt b/benchmark/build.sbt
@@ -6,7 +6,7 @@ libraryDependencies ++= Seq(
   "org.scodec"             %% "scodec-core"         % "2.3.3",
   "org.eclipse.collections" % "eclipse-collections" % "13.0.0",
   "commons-codec"           % "commons-codec"       % "1.20.0",
-  "org.apache.commons"      % "commons-lang3"       % "3.18.0"
+  "org.apache.commons"      % "commons-lang3"       % "3.20.0"
 ) ++ Dependencies.logDeps
 
 // https://github.com/ktoso/sbt-jmh#adding-to-your-project
diff --git a/node-generator/build.sbt b/node-generator/build.sbt
@@ -1,3 +1,3 @@
-libraryDependencies ++= Dependencies.console :+ Dependencies.janino :+ Dependencies.asyncHttpClient :+ Dependencies.logback
+libraryDependencies ++= Dependencies.console :+ Dependencies.asyncHttpClient :+ Dependencies.logback
 
 run / fork := true
diff --git a/node/src/main/resources/logback.xml b/node/src/main/resources/logback.xml
@@ -28,7 +28,11 @@
 
     <include optional="true" file="${waves.config.directory:-.}/logback.xml"/>
 
-    <if condition='property("logback.stdout.enabled").contains("true")'>
+    <condition class="ch.qos.logback.core.boolex.PropertyEqualityCondition">
+        <key>logback.stdout.enabled</key>
+        <value>true</value>
+    </condition>
+    <if>
         <then>
             <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
                 <target>System.out</target>
@@ -45,7 +49,11 @@
         </then>
     </if>
 
-    <if condition='property("logback.file.enabled").contains("true")'>
+    <condition class="ch.qos.logback.core.boolex.PropertyEqualityCondition">
+        <key>logback.file.enabled</key>
+        <value>true</value>
+    </condition>
+    <if>
         <then>
             <property name="appender.name" value="FILE"/>
             <property name="appender.file" value="waves"/>
@@ -59,7 +67,11 @@
         </then>
     </if>
 
-    <if condition='property("logback.utx-trace.enabled").contains("true")'>
+    <condition class="ch.qos.logback.core.boolex.PropertyEqualityCondition">
+        <key>logback.utx-trace.enabled</key>
+        <value>true</value>
+    </condition>
+    <if>
         <then>
             <property name="appender.name" value="UTX-TRACE"/>
             <property name="appender.file" value="utx-trace"/>
diff --git a/node/tests/src/test/scala/com/wavesplatform/network/peer/PeerDatabaseImplSpecification.scala b/node/tests/src/test/scala/com/wavesplatform/network/peer/PeerDatabaseImplSpecification.scala
@@ -67,7 +67,7 @@ class PeerDatabaseImplSpecification extends FreeSpec {
       database.knownPeers.keys should contain(address1)
     }
 
-    "peer should should become obsolete after time" in withDatabase(settings1) { database =>
+    "peer should become obsolete after time" in withDatabase(settings1) { database =>
       database.touch(address1)
       database.knownPeers.keys should contain(address1)
       sleepLong()
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -5,9 +5,9 @@ import scalapb.compiler.Version.scalapbVersion
 
 //noinspection TypeAnnotation
 object Dependencies {
-  private def nettyModule(module: String) = "io.netty" % s"netty-$module" % "4.2.7.Final"
+  private def nettyModule(module: String) = "io.netty" % s"netty-$module" % "4.2.9.Final"
 
-  val gProtoVersion = "4.33.1"
+  val gProtoVersion = "4.33.2"
   val gProto = "com.google.protobuf" % "protobuf-java" % Dependencies.gProtoVersion
   val overrides = Def.setting(
     Seq(
@@ -31,13 +31,13 @@ object Dependencies {
 
   // Node protobuf schemas
   lazy val protoSchemasLib =
-    "com.wavesplatform" % "protobuf-schemas" % "1.6.0-90-SNAPSHOT" classifier "protobuf-src" intransitive ()
+    "com.wavesplatform" % "protobuf-schemas" % "1.6.0" classifier "protobuf-src" intransitive ()
 
-  private def pekkoModule(module: String) = "org.apache.pekko" %% s"pekko-$module" % "1.2.1"
+  private def pekkoModule(module: String) = "org.apache.pekko" %% s"pekko-$module" % "1.4.0"
 
   private def pekkoHttpModule(module: String, version: String = "1.3.0") = "org.apache.pekko" %% module % version
 
-  private def kamonModule(module: String) = "io.kamon" %% s"kamon-$module" % "2.7.7"
+  private def kamonModule(module: String) = "io.kamon" %% s"kamon-$module" % "2.8.0"
 
   private def jacksonModule(group: String, module: String) = s"com.fasterxml.jackson.$group" % s"jackson-$module" % "2.20.1"
 
@@ -51,23 +51,22 @@ object Dependencies {
   val googleGuava     = "com.google.guava"    % "guava"             % "33.5.0-jre"
   val kamonCore       = kamonModule("core")
   val machinist       = "org.typelevel"      %% "machinist"         % "0.6.8"
-  val logback         = "ch.qos.logback"      % "logback-classic"   % "1.5.21"
-  val janino          = "org.codehaus.janino" % "janino"            % "3.1.12"
+  val logback         = "ch.qos.logback"      % "logback-classic"   % "1.5.22"
   val asyncHttpClient = "org.asynchttpclient" % "async-http-client" % "3.0.4"
   val curve25519      = "com.wavesplatform"   % "curve25519-java"   % "0.6.6"
   val nettyHandler    = nettyModule("handler")
 
   val playJson = "org.playframework" %% "play-json" % "3.0.6"
 
   val scalaTest   = "org.scalatest" %% "scalatest" % "3.2.19" % Test
-  val scalaJsTest = Def.setting("com.lihaoyi" %%% "utest" % "0.9.1" % Test)
+  val scalaJsTest = Def.setting("com.lihaoyi" %%% "utest" % "0.9.4" % Test)
 
   private def sttp3Module(module: String) = "com.softwaremill.sttp.client3" %% module % "3.11.0"
 
   val sttp3      = sttp3Module("core")
   val sttp3Monix = sttp3Module("monix")
 
-  val bouncyCastleProvider = "org.bouncycastle" % s"bcprov-jdk18on" % "1.82"
+  val bouncyCastleProvider = "org.bouncycastle" % s"bcprov-jdk18on" % "1.83"
 
   val console = Seq("com.github.scopt" %% "scopt" % "4.1.0")
 
@@ -119,7 +118,6 @@ object Dependencies {
 
   lazy val logDeps = Seq(
     logback              % Runtime,
-    janino               % Runtime,
     pekkoModule("slf4j") % Runtime
   )
 
@@ -131,10 +129,10 @@ object Dependencies {
     Seq(
       rocksdb,
       "commons-net"            % "commons-net"               % "3.12.0",
-      "commons-io"             % "commons-io"                % "2.20.0",
+      "commons-io"             % "commons-io"                % "2.21.0",
       "com.github.pureconfig" %% "pureconfig-core"           % "0.17.9",
       "com.github.pureconfig" %% "pureconfig-generic-scala3" % "0.17.9",
-      "net.logstash.logback"   % "logstash-logback-encoder"  % "8.1" % Runtime,
+      "net.logstash.logback"   % "logstash-logback-encoder"  % "9.0" % Runtime,
       kamonCore,
       kamonModule("system-metrics"),
       kamonModule("influxdb"),
@@ -155,7 +153,7 @@ object Dependencies {
       "com.esaulpaugh"              % "headlong"      % "13.3.1",
       "com.github.jbellis"          % "jamm"          % "0.4.0", // Weighing caches
       web3jModule("abi").excludeAll(ExclusionRule("org.bouncycastle", "bcprov-jdk15on")),
-      "com.wavesplatform" % "blst-java" % "0.3.15-SNAPSHOT"
+      "com.wavesplatform" % "blst-java" % "0.3.15"
     ) ++ console ++ logDeps ++ protobuf.value
   )
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-libraryDependencies ++= Dependencies.console :+ Dependencies.janino :+ Dependencies.asyncHttpClient :+ Dependencies.logback`
	`1`	`+libraryDependencies ++= Dependencies.console :+ Dependencies.asyncHttpClient :+ Dependencies.logback`
`2`	`2`
`3`	`3`	`run / fork := true`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ class PeerDatabaseImplSpecification extends FreeSpec {`
`67`	`67`	`database.knownPeers.keys should contain(address1)`
`68`	`68`	`}`
`69`	`69`
`70`		`- "peer should should become obsolete after time" in withDatabase(settings1) { database =>`
	`70`	`+ "peer should become obsolete after time" in withDatabase(settings1) { database =>`
`71`	`71`	`database.touch(address1)`
`72`	`72`	`database.knownPeers.keys should contain(address1)`
`73`	`73`	`sleepLong()`