Improved CI

ankane · Jun 3, 2024 · 0855b0f · 0855b0f
1 parent ce0bb26
commit 0855b0f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
         config:
           - {os: macos-latest, r: 'release'}
           - {os: windows-latest, r: 'release'}
-          - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release', mariadb: true}
           - {os: ubuntu-latest, r: 'release'}
 
     env:
@@ -37,7 +37,8 @@ jobs:
           extra-packages: any::rcmdcheck
           needs: check
 
-      - name: Install MySQL
+      - if: ${{ !matrix.mariadb }}
+        name: Install MySQL
         uses: ankane/setup-mysql@v1
         with:
           database: dbx_test
@@ -47,6 +48,12 @@ jobs:
           mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'runneradmin'@'localhost'"
           mysql -u root -e "FLUSH PRIVILEGES"
 
+      - if: ${{ matrix.mariadb }}
+        name: Install MariaDB
+        uses: ankane/setup-mysql@v1
+        with:
+          database: dbx_test
+
       - name: Install Postgres
         uses: ankane/setup-postgres@v1
         with:

diff --git a/tests/testthat/helper-run-insert-tests.R b/tests/testthat/helper-run-insert-tests.R
@@ -13,7 +13,7 @@ runInsertTests <- function(db, redshift=FALSE) {
   })
 
   test_that("insert returning works", {
-    skip_if(!isPostgres(db) || redshift)
+    skip_if(!(isPostgres(db) || isMariaDB(db)) || redshift)
 
     events <- data.frame(id=c(1, 2), city=c("San Francisco", "Boston"), stringsAsFactors=FALSE)
     res <- dbxInsert(db, "events", events, returning=c("id", "city"))
@@ -23,7 +23,7 @@ runInsertTests <- function(db, redshift=FALSE) {
   })
 
   test_that("insert returning star works", {
-    skip_if(!isPostgres(db) || redshift)
+    skip_if(!(isPostgres(db) || isMariaDB(db)) || redshift)
 
     events <- data.frame(id=c(1, 2), city=c("San Francisco", "Boston"), stringsAsFactors=FALSE)
     res <- dbxInsert(db, "events", events, returning=c("*"))