Skip to content

Commit

Permalink
Pcr mapping (#36)
Browse files Browse the repository at this point in the history
* Adding mapping for PCR result

* correct issue with pcr

* correct issue with detecte and non-detecte

* Updates and fixes (#37)

* fix failing tests

* Version bump

Co-authored-by: mozzy11 <[email protected]>
Co-authored-by: Celestin Kemar <[email protected]>
Co-authored-by: Jean Daboul MAXY <[email protected]>
Co-authored-by: mozzy11 <[email protected]>
  • Loading branch information
4 people authored Jan 19, 2022
1 parent 827d5ed commit 10de2e7
Show file tree
Hide file tree
Showing 13 changed files with 192 additions and 147 deletions.
41 changes: 29 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ name: CI
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]

release:
types: [ created ]
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

Expand All @@ -28,19 +28,36 @@ jobs:
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 8.0.232
- name: Set up Maven
uses: stCarolas/setup-maven@v4
with:
maven-version: 3.6.3
- name: Cache Maven packages
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- uses: s4u/[email protected]
with:
servers: |
[{
"id": "github-packages",
"username": "${{ secrets.RELEASE_USERNAME }}",
"password": "${{ secrets.RELEASE_TOKEN }}"
}]
properties: |
[
{ "maven.wagon.http.ssl.insecure": "true" },
{ "maven.wagon.http.ssl.allowall": "true" },
{ "maven.wagon.http.ssl.ignore.validity.dates": "true"}
]
githubServer: false
- name: Build with Maven
run: mvn -B install

# Runs a single command using the runners shell
- name: Run a one-line script
run: echo It Ran!



run: mvn -P 'github-packages' -B install
- name: Publish package
run: mvn -P github-packages -DskipTests -Dfindbugs.skip=true -Dpmd.skip=true -Dcpd.skip=true -B deploy
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
if: github.event_name == 'release' && github.event.action == 'created'
38 changes: 0 additions & 38 deletions .github/workflows/release.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ id_file

# Mac OSX
.DS_Store

.flattened-pom.xml
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Lab Integration Module
==========================
![CI](https://github.com/IsantePlus/openmrs-module-labintegration/workflows/CI/badge.svg?branch=master)
[![CI](https://github.com/IsantePlus/openmrs-module-labintegration/actions/workflows/ci.yml/badge.svg)](https://github.com/IsantePlus/openmrs-module-labintegration/actions/workflows/ci.yml)

Description
-----------
Expand Down
2 changes: 1 addition & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>labintegration</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>labintegration-api</artifactId>
Expand Down
Loading

0 comments on commit 10de2e7

Please sign in to comment.