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

MAT-7052 add QICore for FHIR type #3

Merged
merged 11 commits into from
Aug 13, 2024
Merged
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
53 changes: 29 additions & 24 deletions .github/workflows/maven-ci.yml
Original file line number Diff line number Diff line change
@@ -1,46 +1,51 @@
name: Java CI
name: CI

on:
push:
branches: [master, develop]
pull_request:
branches: [master, develop]

workflow_dispatch:
on: [push]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'corretto'
java-version: '17'

# Github Authentication is required to download artifacts from github packages
# A secret is created for this repo, so that github actions can fetch it, the secret is named after GH_PAT_FOR_ACTIONS_TOKEN
distribution: 'adopt'
# Github Authentication is required to download artifacts from github packages
# A secret is created for this repo, so that github actions can fetch it, the secret is named after GH_PAT_FOR_ACTIONS_TOKEN
- name: maven-settings
uses: s4u/maven-settings-action@v2
with:
servers: '[{"id": "github", "username": "madieUser", "password": "${GITHUB_TOKEN_REF}"}]'
githubServer: false

- name: Build with Maven
run: mvn clean install --file pom.xml
env:
GITHUB_TOKEN_REF: ${{ secrets.GH_PAT_FOR_ACTIONS_TOKEN }}


- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3

- name: Cache local Maven repository
uses: actions/cache@v4
publish-snapshot:
needs: build
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
if: github.ref == 'refs/heads/develop'
steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
distribution: 'adopt'
java-version: '17'

- name: Extract project version
run: echo ::set-output name=version::$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
id: project

# publish snapshot iff the project version in pom.xml contains '-SNAPSHOT'
- name: Publish SNAPSHOT version to GitHub Packages
if: contains(steps.project.outputs.version, '-SNAPSHOT')
run: mvn -B --no-transfer-progress deploy -DskipTests
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<spring.test.version>6.1.11</spring.test.version>
<checkstyle.version>3.4.0</checkstyle.version>
<checkstyle.file>madie-checkstyle.xml</checkstyle.file>
<gov.cms.madie.models.version>0.6.49-SNAPSHOT</gov.cms.madie.models.version>
<gov.cms.madie.models.version>0.6.56-SNAPSHOT</gov.cms.madie.models.version>
<com.jayway.jsonpath.version>2.9.0</com.jayway.jsonpath.version>
</properties>
<distributionManagement>
Expand Down
36 changes: 36 additions & 0 deletions settings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd">

<activeProfiles>
<activeProfile>github</activeProfile>
</activeProfiles>

<profiles>
<profile>
<id>github</id>
<repositories>
<repository>
<id>central</id>
<url>https://repo1.maven.org/maven2</url>
</repository>
<repository>
<id>github</id>
<url>https://maven.pkg.github.com/MeasureAuthoringTool/madie-rest-commons/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</profile>
</profiles>

<servers>
<server>
<id>github</id>
<username>${env.GITHUB_USER}</username>
<password>${env.GITHUB_TOKEN}</password>
</server>
</servers>
</settings>
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,9 @@ public void generate() throws IOException {

TranslationResource translationResource =
TranslationResource.getInstance(
usingProperties.getLibraryType() == "FHIR"); // <-- BADDDDD!!!! Defaults to fhir
usingProperties.getLibraryType() == "FHIR"
|| usingProperties.getLibraryType()
== "QICore"); // <-- BADDDDD!!!! Defaults to fhir

CqlPreprocessorVisitor preprocessor =
new CqlPreprocessorVisitor(
Expand Down
Loading