Skip to content

Commit

Permalink
chore(release): prepare for 3.0.0 release (#497)
Browse files Browse the repository at this point in the history
* ci(tags): tag images as 'latest'

* test(smoketest): run 'latest' Cryostat image tag

* chore(release): enable mergify backport rule

* chore(release): update project to 4.0.0-SNAPSHOT, use -core 4.0.0-SNAPSHOT

* build local image with 'latest' tag
  • Loading branch information
andrewazores authored Jun 5, 2024
1 parent d9f05db commit ce3ce47
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 19 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/push-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,7 @@ jobs:
with:
image: ${{ env.CI_IMG }}
archs: amd64, arm64
# tags: ${{ env.IMAGE_VERSION }} ${{ github.ref == 'refs/heads/main' && 'latest' || '' }}
tags: ${{ env.IMAGE_VERSION }}
tags: ${{ env.IMAGE_VERSION }} ${{ github.ref == 'refs/heads/main' && 'latest' || '' }}
containerfiles: |
./src/main/docker/Dockerfile.jvm
- name: Push to quay.io
Expand Down
20 changes: 10 additions & 10 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
pull_request_rules:
#- name: backport patches to cryostat-v3.0 branch
# conditions:
# - base=main
# - label=backport
# actions:
# backport:
# branches:
# - cryostat-v3.0
# assignees:
# - "{{ author }}"
- name: backport patches to cryostat-v3.0 branch
conditions:
- base=main
- label=backport
actions:
backport:
branches:
- cryostat-v3.0
assignees:
- "{{ author }}"

- name: auto label PRs from reviewers
conditions:
Expand Down
2 changes: 1 addition & 1 deletion compose/cryostat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
limits:
cpus: '2'
memory: 512m
image: ${CRYOSTAT_IMAGE:-quay.io/cryostat/cryostat:3.0.0-snapshot}
image: ${CRYOSTAT_IMAGE:-quay.io/cryostat/cryostat:latest}
volumes:
- ${XDG_RUNTIME_DIR}/podman/podman.sock:/run/user/1000/podman/podman.sock:Z
- jmxtls_cfg:/truststore:U
Expand Down
2 changes: 1 addition & 1 deletion compose/cryostat_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
limits:
cpus: '2'
memory: 512m
image: ${CRYOSTAT_IMAGE:-quay.io/cryostat/cryostat:3.0.0-snapshot}
image: ${CRYOSTAT_IMAGE:-quay.io/cryostat/cryostat:latest}
volumes:
- /var/run/docker.sock:/var/run/docker.sock:Z
security_opt:
Expand Down
2 changes: 1 addition & 1 deletion compose/cryostat_k8s.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
condition: service_healthy
s3:
condition: service_healthy
image: ${CRYOSTAT_IMAGE:-quay.io/cryostat/cryostat:3.0.0-snapshot}
image: ${CRYOSTAT_IMAGE:-quay.io/cryostat/cryostat:latest}
hostname: cryostat3
expose:
- "9091"
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.cryostat</groupId>
<artifactId>cryostat3</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>

<repositories>
<repository>
Expand Down Expand Up @@ -38,7 +38,7 @@

<build.arch>amd64</build.arch>

<io.cryostat.core.version>3.0.0-SNAPSHOT</io.cryostat.core.version>
<io.cryostat.core.version>4.0.0-SNAPSHOT</io.cryostat.core.version>
<org.openjdk.jmc.version>9.0.0</org.openjdk.jmc.version>

<org.apache.commons.codec.version>1.16.1</org.apache.commons.codec.version>
Expand Down
2 changes: 1 addition & 1 deletion schema/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ info:
name: Apache 2.0
url: https://github.com/cryostatio/cryostat3/blob/main/LICENSE
title: Cryostat API
version: 3.0.0-snapshot
version: 4.0.0-snapshot
openapi: 3.0.3
paths:
/api/beta/credentials/{connectUrl}:
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,6 @@ quarkus.container-image.registry=quay.io
quarkus.container-image.group=cryostat
quarkus.container-image.name=cryostat
quarkus.container-image.tag=${quarkus.application.version}
quarkus.container-image.additional-tags=dev
quarkus.container-image.additional-tags=dev,latest

quarkus.native.additional-build-args=--initialize-at-run-time=org.openjdk.jmc.jdp.client.JDPClient\\,io.cryostat.core.net.discovery.JvmDiscoveryClient\\,java.net.Inet4Address\\,java.net.Inet6Address

0 comments on commit ce3ce47

Please sign in to comment.