From 48a003cd7f382e1fbe6f9c2ee492f39a27091c53 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sun, 8 Aug 2021 19:23:35 -0500 Subject: [PATCH 1/3] [ci] move Solaris and valgrind test steps into scripts --- .ci/test_r_package_solaris.sh | 13 +++++++++++++ .ci/test_r_package_valgrind.sh | 4 ++++ .github/workflows/r_solaris.yml | 10 +--------- .github/workflows/r_valgrind.yml | 6 ------ 4 files changed, 18 insertions(+), 15 deletions(-) create mode 100755 .ci/test_r_package_solaris.sh diff --git a/.ci/test_r_package_solaris.sh b/.ci/test_r_package_solaris.sh new file mode 100755 index 000000000000..329c6359c5a6 --- /dev/null +++ b/.ci/test_r_package_solaris.sh @@ -0,0 +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="$GITHUB_WORKSPACE/rhub_logs.txt" +Rscript -e "install.packages('rhub', dependencies = c('Depends', 'Imports', 'LinkingTo'), repos = 'https://cran.r-project.org', Ncpus = parallel::detectCores())" || exit -1 + +Rscript $GITHUB_WORKSPACE/.ci/run_rhub_solaris_checks.R $(pwd)/lightgbm_*.tar.gz $log_file || exit -1 diff --git a/.ci/test_r_package_valgrind.sh b/.ci/test_r_package_valgrind.sh index f17b3bc8b9be..2a6ce8dc7f9a 100755 --- a/.ci/test_r_package_valgrind.sh +++ b/.ci/test_r_package_valgrind.sh @@ -1,5 +1,9 @@ #!/bin/bash +RDscriptvalgrind -e "install.packages(c('R6', 'data.table', 'jsonlite', 'testthat'), repos = 'https://cran.r-project.org', Ncpus = parallel::detectCores())" || exit -1 +sh build-cran-package.sh || exit -1 +RDvalgrind CMD INSTALL --preclean --install-tests lightgbm_*.tar.gz || exit -1 + cd R-package/tests ALL_LOGS_FILE="out.log" diff --git a/.github/workflows/r_solaris.yml b/.github/workflows/r_solaris.yml index a297338ba2f6..e0fdd80e3914 100644 --- a/.github/workflows/r_solaris.yml +++ b/.github/workflows/r_solaris.yml @@ -37,15 +37,7 @@ jobs: "Workflow **${{ github.workflow }}** has been triggered! 🚀\r\n${GITHUB_SERVER_URL}/microsoft/LightGBM/actions/runs/${GITHUB_RUN_ID}" - name: Run tests on Solaris shell: bash - run: | - sh build-cran-package.sh || exit -1 - apt-get install --no-install-recommends -y \ - libcurl4-openssl-dev \ - libxml2-dev \ - libssl-dev - log_file="$GITHUB_WORKSPACE/rhub_logs.txt" - Rscript -e "install.packages('rhub', dependencies = c('Depends', 'Imports', 'LinkingTo'), repos = 'https://cran.r-project.org', Ncpus = parallel::detectCores())" - Rscript $GITHUB_WORKSPACE/.ci/run_rhub_solaris_checks.R $(pwd)/lightgbm_*.tar.gz $log_file || exit -1 + run: ./.ci/test_r_package_valgrind.sh - name: Send final status if: ${{ always() }} run: | diff --git a/.github/workflows/r_valgrind.yml b/.github/workflows/r_valgrind.yml index 866faedf29cd..ff37c212a7eb 100644 --- a/.github/workflows/r_valgrind.yml +++ b/.github/workflows/r_valgrind.yml @@ -35,12 +35,6 @@ jobs: $GITHUB_WORKSPACE/.ci/append_comment.sh \ "${{ github.event.client_payload.comment_number }}" \ "Workflow **${{ github.workflow }}** has been triggered! 🚀\r\n${GITHUB_SERVER_URL}/microsoft/LightGBM/actions/runs/${GITHUB_RUN_ID}" - - name: Install packages - shell: bash - run: | - RDscriptvalgrind -e "install.packages(c('R6', 'data.table', 'jsonlite', 'testthat'), repos = 'https://cran.r-project.org', Ncpus = parallel::detectCores())" - sh build-cran-package.sh - RDvalgrind CMD INSTALL --preclean --install-tests lightgbm_*.tar.gz || exit -1 - name: Run tests with valgrind shell: bash run: ./.ci/test_r_package_valgrind.sh From 599fcd18a5e15a35ea2315319a1039a185d5bb07 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 10 Aug 2021 03:18:53 +0100 Subject: [PATCH 2/3] Update .github/workflows/r_solaris.yml Co-authored-by: Nikita Titov --- .github/workflows/r_solaris.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/r_solaris.yml b/.github/workflows/r_solaris.yml index e0fdd80e3914..ee1a581c23b5 100644 --- a/.github/workflows/r_solaris.yml +++ b/.github/workflows/r_solaris.yml @@ -37,7 +37,7 @@ jobs: "Workflow **${{ github.workflow }}** has been triggered! 🚀\r\n${GITHUB_SERVER_URL}/microsoft/LightGBM/actions/runs/${GITHUB_RUN_ID}" - name: Run tests on Solaris shell: bash - run: ./.ci/test_r_package_valgrind.sh + run: ./.ci/test_r_package_solaris.sh - name: Send final status if: ${{ always() }} run: | From 10deff608ebcd95b60abd310472bad181d9768e2 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 9 Aug 2021 21:20:47 -0500 Subject: [PATCH 3/3] relatiev paths --- .ci/test_r_package_solaris.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/test_r_package_solaris.sh b/.ci/test_r_package_solaris.sh index 329c6359c5a6..bf051476a011 100755 --- a/.ci/test_r_package_solaris.sh +++ b/.ci/test_r_package_solaris.sh @@ -7,7 +7,7 @@ apt-get install --no-install-recommends -y \ libxml2-dev \ libssl-dev -log_file="$GITHUB_WORKSPACE/rhub_logs.txt" +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 -Rscript $GITHUB_WORKSPACE/.ci/run_rhub_solaris_checks.R $(pwd)/lightgbm_*.tar.gz $log_file || exit -1 +Rscript ./.ci/run_rhub_solaris_checks.R lightgbm_*.tar.gz $log_file || exit -1