From cfaef267b16a57e6a1cd695dc180cde872ed7455 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Sat, 4 Jan 2025 20:20:52 +0800 Subject: [PATCH 1/3] WSL action supports v2 --- .github/workflows/R-CMD-check-wsl.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/R-CMD-check-wsl.yaml b/.github/workflows/R-CMD-check-wsl.yaml index 2e359f67..8eadfe5e 100644 --- a/.github/workflows/R-CMD-check-wsl.yaml +++ b/.github/workflows/R-CMD-check-wsl.yaml @@ -47,13 +47,12 @@ jobs: - uses: Vampire/setup-wsl@v4 with: distribution: Ubuntu-22.04 - use-cache: 'false' + wsl-version: 2 + use-cache: 'true' set-as-default: 'true' + - name: Install WSL Dependencies run: | - # Bugfix for current gzip (for unpacking apt packages) under WSLv1: - # https://github.com/microsoft/WSL/issues/8219#issuecomment-1110508016 - echo -en '\x10' | sudo dd of=/usr/bin/gzip count=1 bs=1 conv=notrunc seek=$((0x189)) sudo apt-get update sudo apt-get install -y build-essential libopenmpi-dev shell: wsl-bash {0} From 6c65fe9513a2f2dd87d0ae5866d4f21b9c7dc244 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Sat, 4 Jan 2025 20:21:09 +0800 Subject: [PATCH 2/3] WSL action supports v2 --- .github/workflows/R-CMD-check-wsl.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check-wsl.yaml b/.github/workflows/R-CMD-check-wsl.yaml index 8eadfe5e..79c838b7 100644 --- a/.github/workflows/R-CMD-check-wsl.yaml +++ b/.github/workflows/R-CMD-check-wsl.yaml @@ -7,7 +7,7 @@ name: Unit tests - WSL Backend 'on': push: branches: - - master + - gha-wsl2 pull_request: branches: - master From e4741df1609b370f6c3955dbb854fa4de7c6335c Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Sat, 4 Jan 2025 22:31:55 +0800 Subject: [PATCH 3/3] Update CI branch --- .github/workflows/R-CMD-check-wsl.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/R-CMD-check-wsl.yaml b/.github/workflows/R-CMD-check-wsl.yaml index 79c838b7..54539096 100644 --- a/.github/workflows/R-CMD-check-wsl.yaml +++ b/.github/workflows/R-CMD-check-wsl.yaml @@ -7,7 +7,7 @@ name: Unit tests - WSL Backend 'on': push: branches: - - gha-wsl2 + - master pull_request: branches: - master @@ -17,7 +17,7 @@ jobs: if: "! contains(github.event.head_commit.message, '[ci skip]')" runs-on: windows-latest - name: windows-latest-WSLv1 + name: windows-latest-WSL2 env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true