diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 37ebfa2d..6a65cab8 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -40,6 +40,21 @@ jobs: - uses: r-lib/actions/setup-pandoc@v1 + - name: Db unit tests in ubuntu/linux only + if: runner.os != 'Windows' + run: | + if [[ ${{ runner.os }} == Linux ]]; then + echo "GITHUB_ACTIONS_RUN_DB_UNIT_TESTS=true" >> $GITHUB_ENV + else + echo "GITHUB_ACTIONS_RUN_DB_UNIT_TESTS=false" >> $GITHUB_ENV + fi + + - name: Set up MySQL, ubuntu only + if: runner.os == 'Linux' + run: | + sudo /etc/init.d/mysql start + mysql -e 'CREATE DATABASE IF NOT EXISTS rapbase; USE rapbase; CREATE TABLE testTable (id INT, someText VARCHAR(50), someInt INT, someFloat DOUBLE, someTime DATETIME);' -uroot -proot + - name: Query dependencies run: | install.packages('remotes') diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 4b659960..27b042fa 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -13,14 +13,20 @@ jobs: runs-on: ubuntu-20.04 env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + GITHUB_ACTIONS_RUN_DB_UNIT_TESTS: true steps: - uses: actions/checkout@v2 - + - name: Install unmet sys deps run: | sudo apt update sudo apt install -y --no-install-recommends libcurl4-openssl-dev libgit2-dev + - name: Set up MySQL for unit testing + run: | + sudo /etc/init.d/mysql start + mysql -e 'CREATE DATABASE IF NOT EXISTS rapbase; USE rapbase; CREATE TABLE testTable (id INT, someText VARCHAR(50), someInt INT, someFloat DOUBLE, someTime DATETIME);' -uroot -proot + - uses: r-lib/actions/setup-r@v1 - uses: r-lib/actions/setup-pandoc@v1 diff --git a/DESCRIPTION b/DESCRIPTION index 2f3d30ac..230b9c84 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: rapbase Type: Package Title: Base Functions and Resources for Rapporteket -Version: 1.13.0 +Version: 1.13.1 Authors@R: c( person(given = "Are", family = "Edvardsen", diff --git a/NEWS.md b/NEWS.md index 514c203e..ec896c51 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# rapbase 1.13.1 + +* Included unit tests and coverage reporting depending on a test database during github actions (ci) + # rapbase 1.13.0 * New function providing registry db metadata diff --git a/inst/dbConfig.yml b/inst/dbConfig.yml index 51e52901..a38db164 100644 --- a/inst/dbConfig.yml +++ b/inst/dbConfig.yml @@ -10,8 +10,8 @@ nordummy: rapbase: host : 127.0.0.1 name : rapbase - user : travis - pass : + user : root + pass : root disp : ForTestingOnly # for testing, in rap-dev-data container diff --git a/tests/testthat/test-dbConnection.R b/tests/testthat/test-dbConnection.R index 7f89a16a..c0f2c702 100644 --- a/tests/testthat/test-dbConnection.R +++ b/tests/testthat/test-dbConnection.R @@ -14,7 +14,7 @@ context("Handling db connections") checkDb <- function() { if (Sys.getenv("R_RAP_INSTANCE") == "DEV") { NULL - } else if (Sys.getenv("TRAVIS") == "true") { + } else if (Sys.getenv("GITHUB_ACTIONS_RUN_DB_UNIT_TESTS") == "true") { NULL } else { testthat::skip("Test skipped due to lack of database infrastructure")