Skip to content

Commit

Permalink
ci update (#58)
Browse files Browse the repository at this point in the history
version 3.1.2
  • Loading branch information
ennerf authored Oct 9, 2023
1 parent ebbfc4c commit f70f994
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 29 deletions.
20 changes: 4 additions & 16 deletions .github/workflows/native-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
build-images:
strategy:
matrix:
os: [ubuntu-20.04, windows-latest, macos-11, [self-hosted, linux-aarch64]]
os: [ubuntu-20.04, windows-latest, macos-11, [self-hosted, linux-aarch64], [self-hosted, macos-aarch64]]

timeout-minutes: 20
runs-on: ${{ matrix.os }}
Expand All @@ -23,10 +23,10 @@ jobs:
- uses: graalvm/setup-graalvm@v1
with:
version: 'latest'
java-version: '17'
java-version: '21'
set-java-home: 'true'
components: 'native-image'
cache: 'maven'
native-image-job-reports: 'true'
cache: '' # disabled to avoid uploading cache of self-hosted runners
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Build native image
Expand All @@ -52,18 +52,6 @@ jobs:
with:
maven-version: 3.9.1

- name: Build macos-aarch64 image
run: |
export JAVA_HOME=${GRAALVM_HOME}
mvn clean package -Pnative --projects generator -am
- name: Upload macos-aarch64 build
uses: actions/upload-artifact@v3
with:
name: native-images
path: generator/target/*.exe
retention-days: 10

- name: Download native builds
uses: actions/download-artifact@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ In order to use QuickBuffers you need to generate messages and add the correspon

```xml
<properties>
<quickbuf.version>1.3.1</quickbuf.version>
<quickbuf.version>1.3.2</quickbuf.version>
<quickbuf.options>indent=4,allocation=lazy,extensions=embedded</quickbuf.options>
</properties>
```
Expand Down Expand Up @@ -106,7 +106,7 @@ The generator features several options that can be supplied as a comma-separated
| **allocation** | **eager**, lazy, lazymsg | changes the allocation strategy for nested types. `eager` allocates up-front and results in fewer runtime-allocations, but it may be wasteful and prohibits recursive type declarations. `lazy` waits until the field is actually needed. `lazymsg` acts lazy for nested messages, and eager for everything else. |
| **extensions** | **disabled**, embedded | `embedded` adds extensions from within a single protoc call directly to the extended message. This requires extensions to be known at generation time. Some plugins may do a separate request per file, so it may require an import to combine multiple files. |
| **java8_optional** | **false**, true | creates `tryGet` methods that are short for `return if(hasField()) ? Optional.of(getField()) : Optional.absent()`. Requires a runtime with Java 8 or higher. |
| **gen_descriptors** | **false**, true | creates `getDescriptorProtoBytes` methods for integrating with reflection in existing tools
| **gen_descriptors** | **false**, true | creates `descriptor` information for integrating with reflection in existing tools
## Reading and writing messages
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>quickbuf-parent</artifactId>
<groupId>us.hebi.quickbuf</groupId>
<version>1.4-SNAPSHOT</version>
<version>1.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion compat/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>quickbuf-parent</artifactId>
<groupId>us.hebi.quickbuf</groupId>
<version>1.4-SNAPSHOT</version>
<version>1.3.2</version>
</parent>

<artifactId>quickbuf-compat</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion conformance/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>quickbuf-parent</artifactId>
<groupId>us.hebi.quickbuf</groupId>
<version>1.4-SNAPSHOT</version>
<version>1.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
6 changes: 4 additions & 2 deletions generator/native-release/conveyor.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
include required("/stdlib/jdk/20/openjdk.conf")
include required("/stdlib/jvm/default-gui.conf")
conveyor.compatibility-level = 7
conveyor.compatibility-level = 11
app.mac.info-plist.LSMinimumSystemVersion = 13.0 // graal executable

protoc.version = "3.21.12"
protoc.name = "protoc-quickbuf"
Expand All @@ -14,7 +15,7 @@ app {
fsname = protoc-gen-quickbuf
long-fsname = protoc-gen-quickbuf
rdns-name = us.hebi.${app.fsname}
version = 1.3.1
version = 1.3.2
revision = 0

// Icons
Expand All @@ -27,6 +28,7 @@ app {

// Update only on manual request
updates = none
mac.deltas = 0

// Native executables
windows {
Expand Down
2 changes: 1 addition & 1 deletion generator/native-release/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>quickbuf-parent</artifactId>
<groupId>us.hebi.quickbuf</groupId>
<version>1.3.1</version>
<version>1.3.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>quickbuf-parent</artifactId>
<groupId>us.hebi.quickbuf</groupId>
<version>1.4-SNAPSHOT</version>
<version>1.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion parser/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>quickbuf-parent</artifactId>
<groupId>us.hebi.quickbuf</groupId>
<version>1.4-SNAPSHOT</version>
<version>1.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>us.hebi.quickbuf</groupId>
<artifactId>quickbuf-parent</artifactId>
<packaging>pom</packaging>
<version>1.4-SNAPSHOT</version>
<version>1.3.2</version>

<name>QuickBuffers</name>
<url>https:/HebiRobotics/QuickBuffers</url>
Expand Down Expand Up @@ -83,7 +83,7 @@
<proto.dir>${project.basedir}/../runtime/src/test/resources/protos</proto.dir>
<protoc.pluginExt><!-- empty for macOS/linux --></protoc.pluginExt>

<graalvm.tools.version>0.9.24</graalvm.tools.version>
<graalvm.tools.version>0.9.27</graalvm.tools.version>
<native.staticArg>--static</native.staticArg>
<native.extension>.exe</native.extension>
<protoc.os>determined-via-profile</protoc.os>
Expand Down
2 changes: 1 addition & 1 deletion runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>quickbuf-parent</artifactId>
<groupId>us.hebi.quickbuf</groupId>
<version>1.4-SNAPSHOT</version>
<version>1.3.2</version>
</parent>

<artifactId>quickbuf-runtime</artifactId>
Expand Down

0 comments on commit f70f994

Please sign in to comment.