From b7623324d99828921fec114c6e3e44e73ecb3f6a Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 2 Nov 2021 22:13:38 -0500 Subject: [PATCH 1/2] [ci] use wch1/r-debug image in Solaris tests --- .ci/test_r_package_solaris.sh | 6 +++--- .github/workflows/r_solaris.yml | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.ci/test_r_package_solaris.sh b/.ci/test_r_package_solaris.sh index bf051476a011..1daabf08d91a 100755 --- a/.ci/test_r_package_solaris.sh +++ b/.ci/test_r_package_solaris.sh @@ -1,13 +1,13 @@ #!/bin/bash -sh build-cran-package.sh || exit -1 - apt-get install --no-install-recommends -y \ libcurl4-openssl-dev \ libxml2-dev \ libssl-dev -log_file="rhub_logs.txt" Rscript -e "install.packages('rhub', dependencies = c('Depends', 'Imports', 'LinkingTo'), repos = 'https://cran.r-project.org', Ncpus = parallel::detectCores())" || exit -1 +sh build-cran-package.sh || exit -1 + +log_file="rhub_logs.txt" Rscript ./.ci/run_rhub_solaris_checks.R lightgbm_*.tar.gz $log_file || exit -1 diff --git a/.github/workflows/r_solaris.yml b/.github/workflows/r_solaris.yml index 662307fce35d..da19394eedfd 100644 --- a/.github/workflows/r_solaris.yml +++ b/.github/workflows/r_solaris.yml @@ -9,7 +9,7 @@ jobs: name: solaris-cran timeout-minutes: 120 runs-on: ubuntu-latest - container: rocker/r-base + container: wch1/r-debug env: SECRETS_WORKFLOW: ${{ secrets.WORKFLOW }} steps: @@ -19,7 +19,6 @@ jobs: apt-get update apt-get install --no-install-recommends -y \ curl \ - git \ jq - name: Checkout repository uses: actions/checkout@v2.3.4 From 5f33e7289cb0e11550547c744c2671878e7e8efe Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 3 Nov 2021 11:42:55 -0500 Subject: [PATCH 2/2] no git in valgrind tests --- .github/workflows/r_valgrind.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/r_valgrind.yml b/.github/workflows/r_valgrind.yml index ff37c212a7eb..bcf85e1b82a1 100644 --- a/.github/workflows/r_valgrind.yml +++ b/.github/workflows/r_valgrind.yml @@ -19,7 +19,6 @@ jobs: apt-get update apt-get install --no-install-recommends -y \ curl \ - git \ jq - name: Checkout repository uses: actions/checkout@v2.3.4