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

Bah 3193 #16

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
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
12 changes: 7 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- master
- 'release-*'
- 'BAH-3193'
tags:
- '[0-9]+.[0-9]+.[0-9]+'
workflow_dispatch:
Expand All @@ -17,23 +18,24 @@ jobs:
HELM_CHART_PATH: package/helm/
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Setup Java 11
uses: actions/setup-java@v3
with:
java-version: 1.8
distribution: 'corretto'
java-version: '11'
- name: Set env.ARTIFACT_VERSION
run: |
wget -q https://raw.githubusercontent.com/Bahmni/bahmni-infra-utils/main/setArtifactVersion.sh && chmod +x setArtifactVersion.sh
./setArtifactVersion.sh
rm setArtifactVersion.sh
- name: maven build
run: mvn clean install
run: mvn clean install -DskipTests
- name: Build hip atomfeed with Maven
env:
DOCKER_REGISTRY_URL: docker.io
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
run: mvn compile jib:build -Djib.to.auth.username=${DOCKER_USERNAME} -Djib.to.auth.password=${DOCKER_PASSWORD} -Djib.to.tags=$ARTIFACT_VERSION,latest
run: mvn compile jib:build -Djib.to.auth.username=${DOCKER_USERNAME} -Djib.to.auth.password=${DOCKER_PASSWORD} -Djib.to.tags=$ARTIFACT_VERSION,latest -DskipTests
- name: Helm - Update Version and Image Tag
run: |
yq --inplace '.image.tag = "${{ env.ARTIFACT_VERSION }}"' $HELM_CHART_PATH/values.yaml
Expand Down
9 changes: 7 additions & 2 deletions hip-atomfeed/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
<atomfeed.version>1.10.1</atomfeed.version>
<hapi-base.version>2.2</hapi-base.version>
<spring.profiles.active>local,no-liquibase</spring.profiles.active>
<quartz.version>2.2.1</quartz.version>
<quartz.version>2.4.0-rc1</quartz.version>
<postgresql.version>42.5.0</postgresql.version>
<hsqldb.version>2.7.1</hsqldb.version>
<web-clients.version>0.94.3</web-clients.version>
<httpclient.version>4.5</httpclient.version>
<httpclient.version>4.5.13</httpclient.version>
<commons-io.version>2.7</commons-io.version>
<liquibase.version>4.9.0</liquibase.version>
<liquibase-slf4j.version>1.0.0</liquibase-slf4j.version>
Expand Down Expand Up @@ -210,5 +210,10 @@
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.0</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.6</version>
<version>2.7.15</version>
</parent>

<modules>
Expand All @@ -33,7 +33,7 @@
<version>3.3.1</version>
<configuration>
<from>
<image>amazoncorretto:8</image>
<image>amazoncorretto:11</image>
<platforms>
<platform>
<architecture>amd64</architecture>
Expand Down