Skip to content

Commit 048c79b

Browse files
committed
Removed installation of ODBC in Github workflows / Test docker images
1 parent 8286163 commit 048c79b

4 files changed

Lines changed: 2 additions & 12 deletions

File tree

.github/workflows/release_droid_upload_github_release_assets.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jobs:
4646
sudo apt-get -y autoremove
4747
- name: Query dependencies
4848
run: |
49-
install.packages("RODBC")
5049
install.packages("DBI")
5150
install.packages("devtools", dependencies=TRUE)
5251
devtools::install_deps()
@@ -121,7 +120,6 @@ jobs:
121120
sudo apt-get -y autoremove
122121
- name: Query r-dependencies
123122
run: |
124-
install.packages("RODBC")
125123
install.packages("DBI")
126124
install.packages("devtools", dependencies=TRUE)
127125
devtools::install_deps()

.github/workflows/windows_macosx.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,9 @@ jobs:
2727
r-version: ${{ matrix.config.r }}
2828
rtools-version: ${{ matrix.config.r_tools }}
2929

30-
- name: Install unixodbc MacOsX
31-
if: contains(matrix.config.os, 'macos-latest')
32-
run: |
33-
brew install unixodbc
34-
BREW_PREFIX=`brew --prefix`
3530
- name: Query dependencies (macOS)
3631
if: contains(matrix.config.os, 'macos-latest')
3732
run: |
38-
install.packages("RODBC")
3933
install.packages("DBI")
4034
install.packages("pak")
4135
shell: Rscript {0}
@@ -45,7 +39,6 @@ jobs:
4539
if: matrix.config.os == 'windows-latest'
4640
run: |
4741
options(pkgType = "win.binary")
48-
install.packages("RODBC")
4942
install.packages("DBI")
5043
install.packages("pak")
5144
shell: Rscript {0}

tests/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN add-apt-repository -y ppa:deadsnakes/ppa
2727
RUN apt-get update && \
2828
apt-get install -y --no-install-recommends "r-base-core=$R_VERSION" "r-base-dev=$R_VERSION" curl \
2929
libcurl4-openssl-dev libssl-dev libuv1-dev \
30-
libfontconfig1-dev libssh2-1-dev libxml2-dev zlib1g-dev unixodbc-dev \
30+
libfontconfig1-dev libssh2-1-dev libxml2-dev zlib1g-dev \
3131
libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev \
3232
libharfbuzz-dev libfribidi-dev cmake && \
3333
apt-get -y clean && apt-get -y autoremove

tests/cran-submission/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN add-apt-repository -y ppa:deadsnakes/ppa
2626
RUN apt-get update && \
2727
apt-get install -y --no-install-recommends "r-base-core=$R_VERSION" "r-base-dev=$R_VERSION" curl \
2828
libcurl4-openssl-dev libssl-dev \
29-
libssh2-1-dev libxml2-dev zlib1g-dev unixodbc-dev \
29+
libssh2-1-dev libxml2-dev zlib1g-dev \
3030
texlive-latex-base texlive-fonts-recommended texlive-fonts-extra \
3131
texlive-latex-extra texinfo && \
3232
apt-get -y clean && apt-get -y autoremove
@@ -36,7 +36,6 @@ RUN Rscript -e 'install.packages("assertthat")'
3636
RUN Rscript -e 'install.packages("xml2")'
3737
RUN Rscript -e 'install.packages("DBItest")'
3838
RUN Rscript -e 'install.packages("devtools", dependencies=TRUE)'
39-
RUN Rscript -e 'install.packages("RODBC")'
4039

4140
RUN mkdir -p /scripts && \
4241
curl -L -o /scripts/checkbashisms https://sourceforge.net/projects/checkbaskisms/files/2.0.0.2/checkbashisms/download && \

0 commit comments

Comments
 (0)