Skip to content

Commit

Permalink
Revert "turn off line endings conversion on windows"
Browse files Browse the repository at this point in the history
This reverts commit f1a300f.
  • Loading branch information
jianxiaoyang committed Nov 1, 2023
1 parent dc8c260 commit 5cadd55
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 21 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/R_CMD_check_Hades.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ jobs:
WEBAPI_TEST_ADMIN_USER_PASSWORD: ${{ secrets.WEBAPI_TEST_ADMIN_USER_PASSWORD }}

steps:
- name: Configure git
run: git config --global core.autocrlf false

- uses: actions/checkout@v3

- uses: r-lib/actions/setup-r@v2
Expand Down
20 changes: 2 additions & 18 deletions configure.win
Original file line number Diff line number Diff line change
@@ -1,18 +1,2 @@
#!/usr/bin/env sh

# adapted from https://github.com/tidyverse/purrr/blob/main/configure

# Check that this is not just ./configure. We need to run this
# from R CMD INSTALL, to have the R env vars set.

if [ -z "$R_HOME" ]; then
echo >&2 R_HOME is not set, are you running R CMD INSTALL?
exit 1
fi

# Find the R binary we need to use. This is a bit trickier on
# Windows, because it has two architectures. On windows R_ARCH_BIN
# is set, so this should work everywhere.
RBIN="${R_HOME}/bin${R_ARCH_BIN}/R"

"$RBIN" --vanilla --slave -f tools/configure.R
#! /usr/bin/env sh
sh ./configure_win
18 changes: 18 additions & 0 deletions configure_win
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/usr/bin/env sh

# adapted from https://github.com/tidyverse/purrr/blob/main/configure

# Check that this is not just ./configure. We need to run this
# from R CMD INSTALL, to have the R env vars set.

if [ -z "$R_HOME" ]; then
echo >&2 R_HOME is not set, are you running R CMD INSTALL?
exit 1
fi

# Find the R binary we need to use. This is a bit trickier on
# Windows, because it has two architectures. On windows R_ARCH_BIN
# is set, so this should work everywhere.
RBIN="${R_HOME}/bin${R_ARCH_BIN}/R"

"$RBIN" --vanilla --slave -f tools/configure.R

0 comments on commit 5cadd55

Please sign in to comment.