Skip to content

Commit 52312e5

Browse files
authored
chore(r): Update CI setup to silence warnings for Go-based drivers (#2708)
Closes #2707. This is more likely to be a change in Adbc somewhere since it's showing up in all versions. Did we add anything recently that logged anything to stderr or called assert or abort? In the event it can't be avoided (it often can't), we can update the warning fail level for go-based drivers since we don't distribute them on CRAN.
1 parent 8184845 commit 52312e5

File tree

4 files changed

+63
-14
lines changed

4 files changed

+63
-14
lines changed

Diff for: .github/workflows/r-basic.yml

+16-2
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,29 @@ permissions:
3838
contents: read
3939

4040
jobs:
41-
check:
41+
check-c:
4242
strategy:
4343
matrix:
4444
os: [ubuntu]
45-
pkg: [adbcdrivermanager, adbcsqlite, adbcpostgresql, adbcflightsql, adbcsnowflake]
45+
pkg: [adbcdrivermanager, adbcsqlite, adbcpostgresql]
4646

4747
uses: ./.github/workflows/r-check.yml
4848
with:
4949
os: ${{ matrix.os }}
5050
pkg: ${{ matrix.pkg }}
51+
52+
check-go:
53+
strategy:
54+
matrix:
55+
os: [ubuntu]
56+
pkg: [adbcflightsql, adbcsnowflake, adbcbigquery]
57+
58+
uses: ./.github/workflows/r-check.yml
59+
with:
60+
os: ${{ matrix.os }}
61+
pkg: ${{ matrix.pkg }}
62+
# For the r-basic check (that runs on many PRs), just check ERRORs
63+
# (e.g., build failure, test failure)
64+
error-on: error
5165
secrets:
5266
SNOWFLAKE_URI: ${{ secrets.SNOWFLAKE_URI }}

Diff for: .github/workflows/r-check.yml

+5
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ on:
3131
required: false
3232
default: release
3333
type: string
34+
error-on:
35+
required: false
36+
default: warning
37+
type: string
3438
secrets:
3539
SNOWFLAKE_URI:
3640
required: false
@@ -100,6 +104,7 @@ jobs:
100104
R_KEEP_PKG_SOURCE: yes
101105
with:
102106
working-directory: r/${{ inputs.pkg }}
107+
error-on: '"${{ inputs.error-on }}"'
103108

104109
- name: Shutdown docker compose services
105110
if: runner.os == 'Linux'

Diff for: .github/workflows/r-extended.yml

+25-10
Original file line numberDiff line numberDiff line change
@@ -39,48 +39,65 @@ permissions:
3939
jobs:
4040

4141
# Runs R CMD check on the same platforms/R versions CRAN does
42-
cran:
42+
cran-c:
4343
strategy:
4444
matrix:
4545
rversion: [oldrel, release, devel]
4646
os: [macOS, windows, ubuntu]
47-
pkg: [adbcdrivermanager, adbcsqlite, adbcpostgresql, adbcflightsql, adbcsnowflake, adbcbigquery]
47+
pkg: [adbcdrivermanager, adbcsqlite, adbcpostgresql]
48+
fail-fast: false
49+
50+
uses: ./.github/workflows/r-check.yml
51+
with:
52+
os: ${{ matrix.os }}
53+
pkg: ${{ matrix.pkg }}
54+
rversion: ${{ matrix.rversion }}
55+
56+
# Go-based drivers are not distributed on CRAN and are checked with error-on error only
57+
cran-go:
58+
strategy:
59+
matrix:
60+
rversion: [oldrel, release, devel]
61+
os: [macOS, windows, ubuntu]
62+
pkg: [adbcflightsql, adbcsnowflake, adbcbigquery]
4863
fail-fast: false
4964

5065
uses: ./.github/workflows/r-check.yml
5166
with:
5267
os: ${{ matrix.os }}
5368
pkg: ${{ matrix.pkg }}
5469
rversion: ${{ matrix.rversion }}
70+
# Go based drivers generate WARNINGs because some symbols
71+
# are linked in that R CMD check does not allow.
72+
error-on: error
5573
secrets:
5674
SNOWFLAKE_URI: ${{ secrets.SNOWFLAKE_URI }}
5775

5876
# Check older versions of R on Linux. This catches accidental use of newer R functions.
77+
# We don't check Go drivers here because they don't have much R API surface area.
5978
rversions:
6079
strategy:
6180
matrix:
6281
rversion: ["3.6", "4.0", "4.1"]
6382
os: [ubuntu]
64-
pkg: [adbcdrivermanager, adbcsqlite, adbcpostgresql, adbcflightsql, adbcsnowflake, adbcbigquery]
83+
pkg: [adbcdrivermanager, adbcsqlite, adbcpostgresql]
6584
fail-fast: false
6685

6786
uses: ./.github/workflows/r-check.yml
6887
with:
6988
os: ${{ matrix.os }}
7089
pkg: ${{ matrix.pkg }}
7190
rversion: ${{ matrix.rversion }}
72-
secrets:
73-
SNOWFLAKE_URI: ${{ secrets.SNOWFLAKE_URI }}
7491

7592
# Checks on older verions of R on Windows. The Windows build system changed
7693
# several times so we need to check packages on every version. Go-based
7794
# drivers aren't supported before 4.2, so we don't check them here.
78-
# We don't need to check R 4.1 because the build system for R 4.0 and R 4.1
79-
# are the same.
95+
# The test dependencies support the released version and the four previous
96+
# versions (e.g., 4.1 is the minimum supported version as of R 4.5).
8097
winrversions:
8198
strategy:
8299
matrix:
83-
rversion: ["3.6", "4.0"]
100+
rversion: ["4.1"]
84101
os: [windows]
85102
pkg: [adbcdrivermanager, adbcsqlite, adbcpostgresql]
86103
fail-fast: false
@@ -90,8 +107,6 @@ jobs:
90107
os: ${{ matrix.os }}
91108
pkg: ${{ matrix.pkg }}
92109
rversion: ${{ matrix.rversion }}
93-
secrets:
94-
SNOWFLAKE_URI: ${{ secrets.SNOWFLAKE_URI }}
95110

96111
# Runs tests with valgrind. Go does not support valgrind, so we don't run
97112
# those tests here.

Diff for: .github/workflows/r-standard.yml

+17-2
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,30 @@ permissions:
4646
contents: read
4747

4848
jobs:
49-
check:
49+
check-c:
5050
strategy:
5151
matrix:
5252
os: [ubuntu, macOS, windows]
53-
pkg: [adbcdrivermanager, adbcsqlite, adbcpostgresql, adbcflightsql, adbcsnowflake, adbcbigquery]
53+
pkg: [adbcdrivermanager, adbcsqlite, adbcpostgresql]
5454

5555
uses: ./.github/workflows/r-check.yml
5656
with:
5757
os: ${{ matrix.os }}
5858
pkg: ${{ matrix.pkg }}
59+
60+
# Go-based drivers are not distributed on CRAN and are checked with error-on error only
61+
check-go:
62+
strategy:
63+
matrix:
64+
os: [ubuntu, macOS, windows]
65+
pkg: [adbcflightsql, adbcsnowflake, adbcbigquery]
66+
67+
uses: ./.github/workflows/r-check.yml
68+
with:
69+
os: ${{ matrix.os }}
70+
pkg: ${{ matrix.pkg }}
71+
# Go based drivers generate WARNINGs because some symbols
72+
# are linked in that R CMD check does not allow.
73+
error-on: error
5974
secrets:
6075
SNOWFLAKE_URI: ${{ secrets.SNOWFLAKE_URI }}

0 commit comments

Comments
 (0)