diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 587885092..008f5c076 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -297,8 +297,9 @@ integration: script: - R --version - *install-deps ## markdown pkg not present in r-pkgdown image + - mkdir -p ./pkgdown/favicon/ && cp .graphics/favicon/* ./pkgdown/favicon/ ## copy favicons - rm -rf ./vignettes ## r-lib/pkgdown#2383 - - Rscript -e 'pkgdown::build_site(override=list(destination="./pkgdown"))' + - Rscript -e 'pkgdown::build_site(override=list(destination="./website"))' ## html manual, vignettes, repos, cran_web, cran_checks - echo 'source(".ci/ci.R"); source(".ci/publish.R")' >> .Rprofile ## list of available test-* jobs dynamically based on bus/test-* directories @@ -359,12 +360,12 @@ integration: ## web/checks/check_flavors.html - Rscript -e 'check.flavors(names(test.jobs))' ## pkgdown vignettes workaround r-lib/pkgdown#2383 - - mkdir -p pkgdown/articles - - cp bus/integration/cran/library/data.table/doc/*.html pkgdown/articles/. - - rm pkgdown/articles/index.html + - mkdir -p website/articles + - cp bus/integration/cran/library/data.table/doc/*.html website/articles/. + - rm website/articles/index.html ## pkgdown merge - - Rscript -e 'common_files<-function(path1, path2) intersect(list.files(path1, all.files=TRUE, no..=TRUE), list.files(path2, all.files=TRUE, no..=TRUE)); msg = if (length(f<-common_files("pkgdown","bus/integration/cran"))) paste(c("Following artifacts will be overwritten by pkgdown artifacts:", paste0(" ", f)), collapse="\n") else "No overlapping files from pkgdown artifacts"; message(msg); q("no")' - - mv pkgdown/* bus/integration/cran/ + - Rscript -e 'common_files<-function(path1, path2) intersect(list.files(path1, all.files=TRUE, no..=TRUE), list.files(path2, all.files=TRUE, no..=TRUE)); msg = if (length(f<-common_files("website","bus/integration/cran"))) paste(c("Following artifacts will be overwritten by pkgdown artifacts:", paste0(" ", f)), collapse="\n") else "No overlapping files from pkgdown artifacts"; message(msg); q("no")' + - mv website/* bus/integration/cran/ ## add plausible.io stats - find bus/integration/cran -type f -iname "*.html" | xargs sed -i 's!!!g' <<: *artifacts diff --git a/.graphics/favicon/apple-touch-icon-120x120.png b/.graphics/favicon/apple-touch-icon-120x120.png new file mode 100644 index 000000000..1b7b472b3 Binary files /dev/null and b/.graphics/favicon/apple-touch-icon-120x120.png differ diff --git a/.graphics/favicon/apple-touch-icon-152x152.png b/.graphics/favicon/apple-touch-icon-152x152.png new file mode 100644 index 000000000..f2363e268 Binary files /dev/null and b/.graphics/favicon/apple-touch-icon-152x152.png differ diff --git a/.graphics/favicon/apple-touch-icon-180x180.png b/.graphics/favicon/apple-touch-icon-180x180.png new file mode 100644 index 000000000..c1f7cebd8 Binary files /dev/null and b/.graphics/favicon/apple-touch-icon-180x180.png differ diff --git a/.graphics/favicon/apple-touch-icon-60x60.png b/.graphics/favicon/apple-touch-icon-60x60.png new file mode 100644 index 000000000..254fd66fd Binary files /dev/null and b/.graphics/favicon/apple-touch-icon-60x60.png differ diff --git a/.graphics/favicon/apple-touch-icon-76x76.png b/.graphics/favicon/apple-touch-icon-76x76.png new file mode 100644 index 000000000..0b24a0bfc Binary files /dev/null and b/.graphics/favicon/apple-touch-icon-76x76.png differ diff --git a/.graphics/favicon/apple-touch-icon.png b/.graphics/favicon/apple-touch-icon.png new file mode 100644 index 000000000..ff3edd4a4 Binary files /dev/null and b/.graphics/favicon/apple-touch-icon.png differ diff --git a/.graphics/favicon/favicon-16x16.png b/.graphics/favicon/favicon-16x16.png new file mode 100644 index 000000000..feecd9205 Binary files /dev/null and b/.graphics/favicon/favicon-16x16.png differ diff --git a/.graphics/favicon/favicon-32x32.png b/.graphics/favicon/favicon-32x32.png new file mode 100644 index 000000000..044f4cb0e Binary files /dev/null and b/.graphics/favicon/favicon-32x32.png differ diff --git a/.graphics/favicon/favicon.ico b/.graphics/favicon/favicon.ico new file mode 100644 index 000000000..55fb4ebff Binary files /dev/null and b/.graphics/favicon/favicon.ico differ