Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set LANG: en_US.UTF-8 to fix locale issue in rocker #228

Merged
merged 1 commit into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .github/workflows/roxygen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,8 @@ jobs:
}
shell: Rscript {0}
working-directory: ${{ github.event.repository.name }}/${{ inputs.package-subdirectory }}
env:
LANG: en_US.UTF-8

- name: Roxygen check 🅾
run: |
Expand All @@ -163,19 +165,17 @@ jobs:
# Attempt to commit and push man-page updates
if [ "${AUTO_UPDATE}" == "true" ]
then {
# TODO: Disable Roxygen auto-updates until unicode issues are fixed
:
#echo "Regenerating man pages via auto-update"
#git config --global user.name "github-actions"
#git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
#git config pull.rebase false
#BRANCH_NAME="${{ steps.branch-name.outputs.head_ref_branch }}"
#git pull origin ${BRANCH_NAME} || true
#git add -A man/ DESCRIPTION
#git commit -m "[skip roxygen] [skip vbump] Roxygen Man Pages Auto Update"
#git push -v origin HEAD:${BRANCH_NAME} || \
# (echo "⚠️ Could not push to ${BRANCH_NAME} on $(git remote -v show -n origin | grep Push)" && \
# AUTO_UPDATE=failed)
echo "Regenerating man pages via auto-update"
git config --global user.name "github-actions"
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config pull.rebase false
BRANCH_NAME="${{ steps.branch-name.outputs.head_ref_branch }}"
git pull origin ${BRANCH_NAME} || true
git add -A man/ DESCRIPTION
git commit -m "[skip roxygen] [skip vbump] Roxygen Man Pages Auto Update"
git push -v origin HEAD:${BRANCH_NAME} || \
(echo "⚠️ Could not push to ${BRANCH_NAME} on $(git remote -v show -n origin | grep Push)" && \
AUTO_UPDATE=failed)
}
fi
# If auto-update is disabled or is unsuccessful, let 'em know to fix manually
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/style.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,7 @@ jobs:
ext %in% c("R", "Rmd", "Rnw", "Rmarkdown", "qmd")
}
changed_r_files <- Filter(is_r_file, changed_files)
# TODO: Re-enable after styler unicode issues are fixed
#dry <- if(isTRUE(as.logical("${{ inputs.auto-update }}"))) "off" else "on"
dry <- "on"
dry <- if(isTRUE(as.logical("${{ inputs.auto-update }}"))) "off" else "on"
detect <- styler::style_file(changed_r_files, dry = dry)
if (TRUE %in% detect$changed) {
problems <- subset(detect$file, detect$changed == T)
Expand All @@ -140,6 +138,8 @@ jobs:
}
shell: Rscript {0}
working-directory: ${{ github.event.repository.name }}/${{ inputs.package-subdirectory }}
env:
LANG: en_US.UTF-8

- name: Check file existence 🤔
id: check_files
Expand All @@ -157,11 +157,9 @@ jobs:

- name: Autocommit styled files ↗️
id: autocommit-styled-files
if: false
# TODO: Re-enable after styler unicode issues are fixed
#if: >
# inputs.auto-update
# && steps.check_files.outputs.files_exists == 'true'
if: >
inputs.auto-update
&& steps.check_files.outputs.files_exists == 'true'
run: |
git config --global user.name 'github-actions'
git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com'
Expand Down
Loading