Merge branch 'master' into modernise-haskell-bench-ghc912

Author: LesnyRumcajs

.github/workflows/build.yml

@@ -1464,6 +1464,42 @@ jobs:
         GRPC_IMAGE_NAME: ${{ needs.set-image-name.outputs.name }}
 
 
+  scala_proteus_ox_bench:
+    runs-on: ubuntu-latest
+    needs:
+    - set-image-name
+    - changed
+    if: fromJSON(needs.changed.outputs.base) || contains(needs.changed.outputs.files, 'scala_proteus_ox_bench/')
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Build scala_proteus_ox_bench
+      run: ./build.sh scala_proteus_ox_bench
+      env:
+        GRPC_IMAGE_NAME: ${{ needs.set-image-name.outputs.name }}
+
+    - name: Benchmark scala_proteus_ox_bench
+      run: ./bench.sh scala_proteus_ox_bench
+      env:
+        GRPC_BENCHMARK_DURATION: 30s
+        GRPC_IMAGE_NAME: ${{ needs.set-image-name.outputs.name }}
+
+    - if: github.ref == 'refs/heads/master'
+      name: Log in to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - if: github.ref == 'refs/heads/master'
+      name: If on master push image to GHCR
+      run: docker push $GRPC_IMAGE_NAME:scala_proteus_ox_bench-complex_proto
+      env:
+        GRPC_IMAGE_NAME: ${{ needs.set-image-name.outputs.name }}
+
+
   scala_zio_bench:
     runs-on: ubuntu-latest
     needs:

.github/workflows/issue_bench.yml

@@ -10,7 +10,7 @@ jobs:
     if: startsWith(github.event.issue.title, 'RUN BENCHMARK')
     steps:
     - name: Accept the task
-      uses: peter-evans/create-or-update-comment@v4
+      uses: peter-evans/create-or-update-comment@v5
       with:
         issue-number: ${{ github.event.issue.number }}  
         body: |

.gitignore

@@ -9,3 +9,5 @@ payload/
 
 # Build output
 build/
+target/
+project/project/

cpp_grpc_mt_bench/Dockerfile

@@ -1,4 +1,4 @@
-FROM gcc:15.2.0
+FROM gcc:16.1.0
 
 RUN apt-get update && apt-get install -y protobuf-compiler protobuf-compiler-grpc libgrpc++-dev libjemalloc-dev
 

cpp_grpc_st_bench/Dockerfile

@@ -1,4 +1,4 @@
-FROM gcc:15.2.0
+FROM gcc:16.1.0
 
 RUN apt-get update && apt-get install -y protobuf-compiler protobuf-compiler-grpc libgrpc++-dev libjemalloc-dev
 

crystal_grpc_bench/Dockerfile

@@ -1,4 +1,4 @@
-FROM crystallang/crystal:1.7.2
+FROM crystallang/crystal:1.20.1
 
 WORKDIR /app
 COPY crystal_grpc_bench /app

rust_pajamax_bench_onhold/Cargo.toml

@@ -11,8 +11,8 @@ path = "src/helloworld.rs"
 
 [dependencies]
 pajamax = "0.2.0"
-prost = "0.13.5"
+prost = "0.14.3"
 
 [build-dependencies]
-pajamax-build = "0.2.0"
+pajamax-build = "0.3.0"
 prost-build = "0.14.1"

rust_wtx_bench/Cargo.lock

@@ -2,12 +2,12 @@ name := "pekko-grpc-quickstart-scala"
 
 version := "1.0"
 
-scalaVersion := "2.13.17"
+scalaVersion := "2.13.18"
 
 run / fork := true
 
-val pekkoVersion = "1.2.1"
-val pekkoHttpVersion = "1.3.0"
+val pekkoVersion = "2.0.0-M1"
+val pekkoHttpVersion = "2.0.0-M1"
 
 enablePlugins(PekkoGrpcPlugin)
 

scala_pekko_bench/build.sbt

@@ -1,3 +1,3 @@
-addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "1.2.0")
+addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "2.0.0-M1")
 
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1")