Skip to content

Commit

Permalink
Remove native image support (#1307)
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuqi-Du authored Jul 25, 2024
1 parent b07c6be commit b730e80
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 111 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/continuous-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,13 @@ jobs:

# matrix props:
matrix:
type: [ docker, native, dse69-it, hcd-it ]
type: [ docker, dse69-it, hcd-it ]
include:
- type: dse69-it
profile: '-Pdse69-it,offline'
- type: hcd-it
profile: '-Phcd-it,offline'
exclude:
- type: native
#profile: '-Pnative'
- type: docker
#profile: '-Poffline'
steps:
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/docker-image-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ env:
# 1. Runs unit tests
# 2. Then 2 jobs in parallel
# a) Integration tests with docker image
# b) Integration tests with native docker image
jobs:

# builds and pushes the docker image
Expand All @@ -30,13 +29,10 @@ jobs:
# matrix props:
strategy:
matrix:
type: [ docker, native ]
type: [ docker ]
include:
- type: docker
profile: ''
exclude:
- type: native
#profile: '-Pnative'

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -82,9 +78,8 @@ jobs:
# matrix props:
strategy:
matrix:
image: [jsonapi, jsonapi-native ]
exclude:
- image: jsonapi-native
image: [jsonapi ]

env:
# not a newest version, this reflects riptano action target version
COSIGN_VERSION: v1.9.0
Expand Down
15 changes: 4 additions & 11 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,10 @@ jobs:
# matrix props:
strategy:
matrix:
type: [ docker, native ]
type: [ docker ]
include:
- type: docker
profile: ''
exclude:
- type: native
#profile: '-Pnative'

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -192,13 +189,10 @@ jobs:
# matrix props:
strategy:
matrix:
type: [ docker, native ]
type: [ docker ]
include:
- type: docker
profile: ''
exclude:
- type: native
#profile: '-Pnative'

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -265,9 +259,8 @@ jobs:

strategy:
matrix:
image: [jsonapi, jsonapi-native]
exclude:
- image: jsonapi-native
image: [jsonapi]

env:
# not a newest version, this reflects riptano action target version
COSIGN_VERSION: v1.9.0
Expand Down
16 changes: 0 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,22 +166,6 @@ If you want to build an _über-jar_, execute the following command:

The application, packaged as an _über-jar_, is now runnable using `java -jar target/*-runner.jar`.

### Creating a native executable

You can create a native executable using:
```shell script
./mvnw package -Pnative
```

Or, if you don't have GraalVM installed, you can run the native executable build in a container using:
```shell script
./mvnw package -Pnative -Dquarkus.native.container-build=true
```

You can then execute your native executable with: `./target/sgv2-jsonapi-${project.version}-runner`

If you want to learn more about building native executables, please consult https://quarkus.io/guides/maven-tooling.

### Creating a Docker image

You can create a Docker image named `io.stargate/jsonapi` using:
Expand Down
16 changes: 0 additions & 16 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@
</goals>
<configuration>
<systemPropertyVariables>
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
<testing.containers.cassandra-image>${stargate.int-test.cassandra.image}:${stargate.int-test.cassandra.image-tag}</testing.containers.cassandra-image>
<testing.containers.stargate-image>${stargate.int-test.coordinator.image}:${stargate.int-test.coordinator.image-tag}</testing.containers.stargate-image>
Expand All @@ -303,21 +302,6 @@
</plugins>
</build>
<profiles>
<profile>
<id>native</id>
<activation>
<property>
<name>native</name>
</property>
</activation>
<properties>
<skipITs>false</skipITs>
<quarkus.package.type>native</quarkus.package.type>
<!-- Please update GitHub workflows that build docker images if changing image name -->
<quarkus.container-image.name>jsonapi-native</quarkus.container-image.name>
<quarkus.native.native-image-xmx>6G</quarkus.native.native-image-xmx>
</properties>
</profile>
<profile>
<!-- This profile needs to be activated while working with offline mode related files such as FileWriterSession.java -->
<id>offline</id>
Expand Down
27 changes: 0 additions & 27 deletions src/main/docker/Dockerfile.native

This file was deleted.

30 changes: 0 additions & 30 deletions src/main/docker/Dockerfile.native-micro

This file was deleted.

0 comments on commit b730e80

Please sign in to comment.