Skip to content

Commit

Permalink
Merge branch 'main' into release-0.16.11
Browse files Browse the repository at this point in the history
  • Loading branch information
froggleston committed Jan 16, 2025
2 parents 7ff9a1d + cee3d02 commit d73cd18
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,18 @@ jobs:
R_KEEP_PKG_SOURCE: yes
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
RENV_PATHS_ROOT: ${{ matrix.config.cache }}
LANG: "en_US.UTF-8"

steps:
- name: Record Linux Version
- name: Setup Linux Environment
if: runner.os == 'Linux'
run: |
echo "OS_VERSION=`lsb_release -sr`" >> $GITHUB_ENV
mkdir -p "${{ runner.temp }}/sandbox/"
echo "RENV_PATHS_SANDBOX=${{ runner.temp }}/sandbox/" >> $GITHUB_ENV
sudo locale-gen en_US.UTF-8
sudo update-locale LANG=en_US.UTF-8
shell: bash

- name: "Windows: prevent autocrlf"
if: runner.os == 'Windows'
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ jobs:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
RENV_PATHS_ROOT: ~/.local/share/renv
OS_VERSION: 1
LANG: "en_US-UTF.8"
LANGUAGE: "en_US.UTF-8"
LC_ALL: "en_US.UTF-8"
LC_MESSAGES: "en_US.UTF-8"

steps:
- uses: actions/checkout@v4
Expand All @@ -27,11 +31,13 @@ jobs:
- name: "Set up pandoc"
uses: r-lib/actions/setup-pandoc@v2

- name: "Install sysreqs"
- name: "Setup System Environment"
id: run-apt
shell: bash
run: |
sudo apt update || exit 0
sudo locale-gen en_US.UTF-8
sudo update-locale LANGUAGE=en_US.UTF-8 LC_ALL=en_US.UTF-8 LC_MESSAGES=en_US.UTF-8 LANG=en_US.UTF-8
curl https://carpentries.r-universe.dev/stats/sysdeps 2> /dev/null \
| jq -r '.headers[0] | select(. != null)' 2> /dev/null \
> ${{ runner.temp }}/sysdeps.txt
Expand Down

0 comments on commit d73cd18

Please sign in to comment.