build chain upd

gagolews · May 1, 2021 · 39fb530 · 39fb530
1 parent 08a7a0b
commit 39fb530
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/r-icu-bundle.yml b/.github/workflows/r-icu-bundle.yml
@@ -20,8 +20,8 @@ jobs:
         sudo add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -cs)-cran40/"
         sudo apt-get -y upgrade
         sudo apt-get -y install libcurl4-openssl-dev r-base-dev devscripts
-        sudo Rscript -e "install.packages(c('tinytest', 'roxygen2', 'pkgbuild'))"
-    - name: Test and check R
+        sudo Rscript -e "install.packages(c('tinytest', 'roxygen2', 'pkgbuild', 'Rcpp'))"
+    - name: Test and check stringi
       run: |
         sudo make r-icu-bundle
         sudo make tinytest

diff --git a/.github/workflows/r-icu-system.yml b/.github/workflows/r-icu-system.yml
@@ -15,9 +15,9 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get -y upgrade
-        sudo apt-get -y install libcurl4-openssl-dev r-base-dev devscripts libicu-dev
-        sudo Rscript -e "install.packages(c('tinytest'))"
-    - name: Test and check R
+        sudo apt-get -y install libcurl4-openssl-dev r-base-dev devscripts libicu-dev language-pack-pl
+        sudo Rscript -e "install.packages(c('tinytest', 'Rcpp'))"
+    - name: Test stringi
       run: |
-        sudo make r-icu-system
-        sudo make tinytest
+        LC_ALL="pl_PL.UTF-8" sudo make r-icu-system
+        LC_ALL="pl_PL.UTF-8" sudo make tinytest
diff --git a/Makefile b/Makefile
@@ -9,9 +9,11 @@ all: r
 #CPPFLAGS="-fopenmp -march=native -mtune=native"
 #LDFLAGS="-fopenmp"
 
-r:
-	Rscript -e 'roxygen2::roxygenise(roclets=c("rd", "collate", "namespace", "vignette"), load_code=roxygen2::load_installed)'
+autoconf:
 	autoconf
+	Rscript -e 'roxygen2::roxygenise(roclets=c("rd", "collate", "namespace", "vignette"), load_code=roxygen2::load_installed)'
+
+r: autoconf
 	R CMD INSTALL . --configure-args='--disable-pkg-config --enable-gcc-debug --enable-gcc-pedantic' --html
 
 r-icu-system:
@@ -20,20 +22,18 @@ r-icu-system:
 r-icu-bundle:
 	R CMD INSTALL . --configure-args='--disable-pkg-config'
 
+tinytest:
+	Rscript -e 'options(width=120); source("devel/tinytest.R")'
+
+test: r tinytest
+
 build:
-	Rscript -e 'roxygen2::roxygenise(roclets=c("rd", "collate", "namespace", "vignette"))'
-	autoconf
 	cd .. && R CMD INSTALL stringi --preclean --html
 	cd .. && R CMD build stringi
+	make clean
 
 check: build
 	cd .. && R CMD check `ls -t stringi*.tar.gz | head -1` --no-manual #--as-cran
-	make clean
-
-tinytest:
-	Rscript -e 'options(width=120); source("devel/tinytest.R")'
-
-test: r tinytest
 
 weave:
 	cd devel/sphinx/weave && make && cd ../../../

diff --git a/devel/tinytest/test-time-zone.R b/devel/tinytest/test-time-zone.R
@@ -33,6 +33,6 @@ expect_equivalent(stri_timezone_info(tz = "Europe/Warsaw", locale = "en_GB"),
     list("Europe/Warsaw", "Central European Standard Time", "Central European Summer Time",
         "Central European Standard Time", 1, TRUE))
 
-expect_equivalent(stri_timezone_info(tz = "Asia/Kathmandu", locale = "pl_PL"),
-    list("Asia/Kathmandu", "Nepal", NA_character_, "Nepal Standard Time", 5.75,
+expect_equivalent(stri_timezone_info(tz = "Asia/Kathmandu", locale = "en_GB"),
+    list("Asia/Kathmandu", "Nepal Time", NA_character_, "Nepal Standard Time", 5.75,
         FALSE))