From 6dac5ae600974a1f2a974f9d09c6145861b3e24c Mon Sep 17 00:00:00 2001 From: cstoeckert Date: Wed, 25 Aug 2021 09:36:25 -0400 Subject: [PATCH 1/9] Update README.md Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 83e23bca..db2e91df 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ ## Overview -Carnval uses objects called _vines_ to connect to external data sources and _reapers_ encode the domain knowledge specific to that data source. Vines can connect to sources such as MySql or Oracle databases, RedCap projects, and CSV files. Some vine features include: +Carnival uses objects called _vines_ to connect to external data sources and _reapers_ encode the domain knowledge specific to that data source. Vines can connect to sources such as MySql or Oracle databases, RedCap projects, and CSV files. Some vine features include: - Parameterized SQL queries - Utilities to compose iterative SQL from lists of identifiers and codes From ac6e00c280daefb7908214545f6bc5715f3a8b33 Mon Sep 17 00:00:00 2001 From: hjwilli Date: Wed, 15 Sep 2021 18:15:10 -0400 Subject: [PATCH 2/9] update coveralls package version support for github actions added Ref #62 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index e0276b54..44366e96 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,7 +30,7 @@ plugins { // code coverage id 'jacoco' - id 'com.github.kt3k.coveralls' version '2.6.3' + id 'com.github.kt3k.coveralls' version '2.12.0' } From 78b2e9593f402ea65d948d32cfd8b5a6b49b7cf0 Mon Sep 17 00:00:00 2001 From: hjwilli Date: Wed, 15 Sep 2021 18:24:40 -0400 Subject: [PATCH 3/9] Create carnival_ci.yml Move CI to github actions Ref #62 --- .github/workflows/carnival_ci.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/carnival_ci.yml diff --git a/.github/workflows/carnival_ci.yml b/.github/workflows/carnival_ci.yml new file mode 100644 index 00000000..92fbc196 --- /dev/null +++ b/.github/workflows/carnival_ci.yml @@ -0,0 +1,26 @@ +name: Carnival CI + +on: + push: + workflow_dispatch: + +jobs: + test_runner: + runs-on: ubuntu-18.04 + + steps: + - uses: actions/checkout@v2 + + - name: Build testing container + run: docker-compose -f ./docker-compose-test.yml build -m 8g + + - name: Run tests and publish coverage results + run: | + docker run \ + -v $(pwd):/appsrc \ + -w /appsrc/app \ + carnival_app gradle test coveralls --console=plain --continue -Dtest.http=false + env: + COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }} + + From f38a073313abd501d706ef7c7d441090acd3b95a Mon Sep 17 00:00:00 2001 From: hjwilli Date: Wed, 15 Sep 2021 18:28:03 -0400 Subject: [PATCH 4/9] Update carnival_ci.yml syntax fix Ref #62 --- .github/workflows/carnival_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/carnival_ci.yml b/.github/workflows/carnival_ci.yml index 92fbc196..d43db101 100644 --- a/.github/workflows/carnival_ci.yml +++ b/.github/workflows/carnival_ci.yml @@ -21,6 +21,6 @@ jobs: -w /appsrc/app \ carnival_app gradle test coveralls --console=plain --continue -Dtest.http=false env: - COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }} + COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} From 0a70baefbdec7dcf725836f3f38d16dae4d9e3ff Mon Sep 17 00:00:00 2001 From: hjwilli Date: Thu, 16 Sep 2021 18:03:49 -0400 Subject: [PATCH 5/9] Update carnival_ci.yml Ref #62 --- .github/workflows/carnival_ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/carnival_ci.yml b/.github/workflows/carnival_ci.yml index d43db101..d71559dd 100644 --- a/.github/workflows/carnival_ci.yml +++ b/.github/workflows/carnival_ci.yml @@ -16,10 +16,10 @@ jobs: - name: Run tests and publish coverage results run: | - docker run \ - -v $(pwd):/appsrc \ + docker-compose -f docker-compose-test.yml \ -w /appsrc/app \ - carnival_app gradle test coveralls --console=plain --continue -Dtest.http=false + app \ + gradle test coveralls --console=plain --continue -Dtest.http=false env: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} From 8f532a822afb84121b390ac823d5bbcdd9a30b23 Mon Sep 17 00:00:00 2001 From: hjwilli Date: Thu, 16 Sep 2021 18:05:31 -0400 Subject: [PATCH 6/9] Update carnival_ci.yml Ref #62 --- .github/workflows/carnival_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/carnival_ci.yml b/.github/workflows/carnival_ci.yml index d71559dd..dd31270b 100644 --- a/.github/workflows/carnival_ci.yml +++ b/.github/workflows/carnival_ci.yml @@ -16,7 +16,7 @@ jobs: - name: Run tests and publish coverage results run: | - docker-compose -f docker-compose-test.yml \ + docker-compose -f docker-compose-test.yml run \ -w /appsrc/app \ app \ gradle test coveralls --console=plain --continue -Dtest.http=false From b05d7b97cb8046dc13577e8595b904bf77426dcd Mon Sep 17 00:00:00 2001 From: hjwilli Date: Mon, 20 Sep 2021 16:41:38 -0400 Subject: [PATCH 7/9] Update carnival_ci.yml whitespace --- .github/workflows/carnival_ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/carnival_ci.yml b/.github/workflows/carnival_ci.yml index dd31270b..9edf9066 100644 --- a/.github/workflows/carnival_ci.yml +++ b/.github/workflows/carnival_ci.yml @@ -16,10 +16,7 @@ jobs: - name: Run tests and publish coverage results run: | - docker-compose -f docker-compose-test.yml run \ - -w /appsrc/app \ - app \ - gradle test coveralls --console=plain --continue -Dtest.http=false + docker-compose -f docker-compose-test.yml run -w /appsrc/app app gradle test coveralls --console=plain --continue -Dtest.http=false env: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} From 43ec3572e4d6dd64582ac2ce41238b7e8e084ff6 Mon Sep 17 00:00:00 2001 From: hjwilli Date: Mon, 20 Sep 2021 17:42:00 -0400 Subject: [PATCH 8/9] Update carnival_ci.yml set coveralls env variable --- .github/workflows/carnival_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/carnival_ci.yml b/.github/workflows/carnival_ci.yml index 9edf9066..ac1ef6a1 100644 --- a/.github/workflows/carnival_ci.yml +++ b/.github/workflows/carnival_ci.yml @@ -16,7 +16,7 @@ jobs: - name: Run tests and publish coverage results run: | - docker-compose -f docker-compose-test.yml run -w /appsrc/app app gradle test coveralls --console=plain --continue -Dtest.http=false + docker-compose -f docker-compose-test.yml run -e COVERALLS_REPO_TOKEN -w /appsrc/app app gradle test coveralls --console=plain --continue -Dtest.http=false env: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} From e96a0f2eed8b9564f7781937057ad3cef21439fe Mon Sep 17 00:00:00 2001 From: hjwilli Date: Tue, 21 Sep 2021 17:31:56 -0400 Subject: [PATCH 9/9] Update README.md github actions CI badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 83e23bca..97f40e29 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://github.com/pennbiobank/pennai/carnival-public/master/LICENSE) -[![Build Status](https://travis-ci.org/pmbb-ibi/carnival.svg?branch=master)](https://travis-ci.org/pmbb-ibi/carnival) +[![Carnival CI](https://github.com/pmbb-ibi/carnival/actions/workflows/carnival_ci.yml/badge.svg)](https://github.com/pmbb-ibi/carnival/actions/workflows/carnival_ci.yml) Coverage Status # Carnival