Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove native image support #1307

Merged
merged 4 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 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.