Skip to content

Commit

Permalink
Merge branch 'master' into php/upgrade/v8
Browse files Browse the repository at this point in the history
  • Loading branch information
waghanza authored Jan 23, 2021
2 parents a8b755c + 05f49ec commit 359b794
Show file tree
Hide file tree
Showing 17 changed files with 328 additions and 183 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @waghanza
18 changes: 10 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
schedule:
- cron: 0 0 * * 3
jobs:
dynamic_matrix:
matrix:
runs-on: ubuntu-latest

steps:
Expand All @@ -28,13 +28,14 @@ jobs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}

test_implementations:
needs: dynamic_matrix
test:
needs: matrix

runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix: ${{fromJson(needs.dynamic_matrix.outputs.matrix)}}
matrix: ${{fromJson(needs.matrix.outputs.matrix)}}

steps:
- uses: actions/checkout@v2
Expand All @@ -45,11 +46,12 @@ jobs:
- name: Configure
run: bundle exec rake config

- name: Build
- name: Setup
run: |
cd ${{ matrix.directory }}
cd ${{ matrix.directory }}
make build -f .Makefile
cd -
- name: Test
run: FRAMEWORK=${{ matrix.framework }} bundle exec rspec .spec
run: bundle exec rspec .spec
env:
FRAMEWORK: ${{ matrix.framework }}
334 changes: 168 additions & 166 deletions README.md

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions java/quarkus/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
target
*.class
11 changes: 11 additions & 0 deletions java/quarkus/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
framework:
website: quarkus.io
version: 1.11

build:
- mvn clean package -Dquarkus.package.type=uber-jar -Dquarkus.http.port=3000 -Pnative

binaries:
- target/quarkus-1.0.0-runner.jar

command: /usr/bin/java -XX:+UseNUMA -XX:+UseParallelGC -XX:+AggressiveOpts -jar /opt/web/target/quarkus-1.0.0-runner.jar
93 changes: 93 additions & 0 deletions java/quarkus/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<?xml version="1.0"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>benchmarker.the</groupId>
<artifactId>quarkus</artifactId>
<version>1.0.0</version>
<properties>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<maven.compiler.parameters>true</maven.compiler.parameters>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>


<quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
<quarkus.platform.version>1.11.0.Final</quarkus.platform.version>

</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>${quarkus.platform.artifact-id}</artifactId>
<version>${quarkus.platform.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-container-image-docker</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.platform.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>build</goal>
<goal>generate-code</goal>
<goal>generate-code-tests</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${compiler-plugin.version}</version>
</plugin>
<!-- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-plugin.version}</version>
<configuration>
<systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
<maven.home>${maven.home}</maven.home>
</systemPropertyVariables>
</configuration>
</plugin> -->
</plugins>
</build>
<profiles>
<profile>
<id>native</id>
<activation>
<property>
<name>native</name>
</property>
</activation>
<build>
<plugins></plugins>
</build>
<properties>
<quarkus.package.type>native</quarkus.package.type>
</properties>
</profile>
</profiles>
</project>
33 changes: 33 additions & 0 deletions java/quarkus/src/main/java/yolo/BenchmarkResource.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package yolo;

import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;

@Path("/")
public class BenchmarkResource {

@GET
@Path("/")
@Produces(MediaType.TEXT_PLAIN)
public String root() {
return "";
}

@GET
@Path("/user/{id}")
@Produces(MediaType.TEXT_PLAIN)
public String userId(String id) {
return id;
}

@POST
@Path("/user")
@Produces(MediaType.TEXT_PLAIN)
public String user() {
return "";
}
}
1 change: 1 addition & 0 deletions java/quarkus/src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
quarkus.http.port=3000
2 changes: 1 addition & 1 deletion java/restheart/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ files:

environment:
RH_IO_THREADS: 1
RH_WORKER_THREADS: 4
RH_WORKER_THREADS: 2

binaries:
- target/benchmark.jar
Expand Down
2 changes: 1 addition & 1 deletion php/chubbyphp-roadrunner/composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"chubbyphp/chubbyphp-framework": "~3.3.0",
"chubbyphp/chubbyphp-framework": "~3.4.0",
"chubbyphp/chubbyphp-framework-router-fastroute": "*",
"slim/psr7": "*",
"spiral/roadrunner": "*"
Expand Down
2 changes: 1 addition & 1 deletion php/chubbyphp-roadrunner/config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
framework:
github: chubbyphp/chubbyphp-framework
version: 3.3
version: 3.4

before_command:
- vendor/bin/rr get-binary
Expand Down
2 changes: 1 addition & 1 deletion php/chubbyphp-swoole/composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"chubbyphp/chubbyphp-framework": "~3.3.0",
"chubbyphp/chubbyphp-framework": "~3.4.0",
"chubbyphp/chubbyphp-framework-router-fastroute": "*",
"chubbyphp/chubbyphp-swoole-request-handler": "*",
"slim/psr7": "*"
Expand Down
2 changes: 1 addition & 1 deletion php/chubbyphp-swoole/config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
framework:
github: chubbyphp/chubbyphp-framework
version: 3.3
version: 3.4

php_ext:
- swoole
Expand Down
2 changes: 1 addition & 1 deletion php/chubbyphp-workerman/composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"chubbyphp/chubbyphp-framework": "~3.3.0",
"chubbyphp/chubbyphp-framework": "~3.4.0",
"chubbyphp/chubbyphp-framework-router-fastroute": "*",
"chubbyphp/chubbyphp-workerman-request-handler": "*",
"slim/psr7": "*"
Expand Down
2 changes: 1 addition & 1 deletion php/chubbyphp-workerman/config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
framework:
github: chubbyphp/chubbyphp-framework
version: 3.3
version: 3.4

build_deps:
- libevent-dev
Expand Down
2 changes: 1 addition & 1 deletion php/chubbyphp/composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"chubbyphp/chubbyphp-framework": "~3.3.0",
"chubbyphp/chubbyphp-framework": "~3.4.0",
"chubbyphp/chubbyphp-framework-router-fastroute": "*",
"slim/psr7": "*"
}
Expand Down
2 changes: 1 addition & 1 deletion php/chubbyphp/config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
framework:
github: chubbyphp/chubbyphp-framework
version: 3.3
version: 3.4

0 comments on commit 359b794

Please sign in to comment.