Skip to content

Commit 62c162a

Browse files
committed
wip
1 parent df3348d commit 62c162a

File tree

3 files changed

+25
-3
lines changed

3 files changed

+25
-3
lines changed

.github/workflows/check-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ jobs:
5050
- name: Run tests
5151
run: |
5252
forge --version
53-
sbt --batch "scalafmtCheck;test;docker;consensus-client-it/test"
53+
sbt --no-colors --batch "scalafmtCheck;test;docker;consensus-client-it/test"
5454
env:
5555
RUN_ID: ${{ github.head_ref }}-${{ github.run_number }}-${{ github.run_attempt }}
5656
- uses: scacap/action-surefire-report@5609ce4db72c09db044803b344a8968fd1f315da
5757
if: always()
5858
with:
5959
report_paths: '**/target/test-reports/*.xml'
60-
create_check: false
60+
create_check: true
6161
check_name: 'Check PR'
6262
- name: Archive logs
6363
uses: actions/upload-artifact@v4

build.sbt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,29 @@
11
import com.github.sbt.git.SbtGit.GitKeys.gitCurrentBranch
2+
import sbt.Def
3+
import sbt.internal.RelayAppender
4+
import sbt.util.Level
25

36
enablePlugins(UniversalDeployPlugin, GitVersioning, sbtdocker.DockerPlugin, VersionObject)
47

8+
extraAppenders := {
9+
extraAppenders.value
10+
11+
(s: Def.ScopedKey[?]) =>
12+
new RelayAppender("RELAY") {
13+
override def appendLog(level: Level.Value, message: => String): Unit = {
14+
if (level >= Level.Warn) {
15+
println(s)
16+
val lines = message.split("\n")
17+
if (lines.length > 1)
18+
println(s"::$level file=,title=${lines(0)}::${lines.tail.mkString("%0A")}")
19+
else
20+
println(s"::$level::$message")
21+
}
22+
super.appendLog(level, message)
23+
}
24+
} +: extraAppenders.value(s)
25+
}
26+
527
git.useGitDescribe := true
628
git.baseVersion := "1.1.0"
729
git.uncommittedSignifier := Some("DIRTY")

src/main/scala/units/ELUpdater.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class ELUpdater(
7171
def executionBlockReceived(block: NetworkL2Block, ch: Channel): Unit = scheduler.execute { () =>
7272
logger.debug(s"New block ${block.hash}->${block.parentHash} (timestamp=${block.timestamp}, height=${block.height}) appeared")
7373

74-
val now = time.correctedTime() / 1000
74+
val now = time.correctedTime() /\ 1000
7575
if (block.timestamp - now <= MaxTimeDrift) {
7676
state match {
7777
case WaitingForSyncHead(target, _) if block.hash == target.hash =>

0 commit comments

Comments
 (0)