Merge pull request plotly#7 from plotly/fix-ci

Joseph Damiba · web-flow · commit f89a05294194 · 2020-01-05T20:35:03.000-05:00
Squash CI Bugs
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,8 @@
 version: 2
 jobs:
   build:
-    ignore:
+    branches:
+      ignore:
         - built
     working_directory: ~/project
     docker:
@@ -15,6 +16,7 @@ jobs:
           keys:
             - cache2
       - run:
+          name: Install container-level dependencies
           command: |
             sudo apt-get update -y
             sudo apt-get install -y curl python3-pip python3-venv ssh-client ssh git
@@ -23,6 +25,7 @@ jobs:
           name: Keyscan Github (HACK)
           command: ssh-keyscan -H github.com >> ~/.ssh/known_hosts
       - run:
+          name: install application-level dependencies
           command: |
             sudo apt-get install -y pandoc libudunits2-dev libgdal-dev libxt-dev libglu1-mesa-dev
             sudo R -e 'install.packages(c("curl", "devtools", "mvtnorm")); devtools::install_github("hypertidy/anglr"); devtools::install_github("johannesbjork/LaCroixColoR"); devtools::install_deps(dependencies = TRUE) '
@@ -34,6 +37,7 @@ jobs:
           path: man/
           destination: man
       - run:
+          name: build site and perform front-matter checks
           command: |
             rm -rf build
             mkdir build
@@ -49,14 +53,15 @@ jobs:
             curl https://raw.githubusercontent.com/plotly/documentation/source-design-merge/check-or-enforce-order.py > check-or-enforce-order.py
             python check-or-enforce-order.py build/r
       - run:
+          name: deploy to plotly/r.docs:built
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
               cd build
               git init
               git config user.name plotlydocbot
               git config user.email accounts@plot.ly
               rm -rf r/*.html
-              sed -i.bkp 's/<!--.*-->//g' r/*md && rm r/*.bkp
+              sed -i.bkp 's/<!--.*-->//g' r/*md && rm r/*.bkp # remove html comments
               rm -rf ggplot2/*.html
               sed -i.bkp 's/<!--.*-->//g' ggplot2/*md && rm ggplot2/*.bkp
               git add *
@@ -66,7 +71,7 @@ jobs:
             fi
 
       - run:
-          name: trigger doc build
+          name: trigger plotly/documentation build
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
               git clone --depth=1 --branch=source-design-merge https://github.com/plotly/documentation.git
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -13,6 +13,7 @@ Imports:
     readr,
     MASS,
     htmltools,
+    random,
     tidyr,
     broom,
     cli,
diff --git a/r/2016-06-17-3d-tri-surf.Rmd b/r/2016-06-17-3d-tri-surf.Rmd
@@ -73,12 +73,7 @@ p
 library(plotly)
 library(geomorph)
 
-plyFile <- 'http://people.sc.fsu.edu/~jburkardt/data/ply/chopper.ply'
-dest <- basename(plyFile)
-if (!file.exists(dest)) {
-  download.file(plyFile, dest)
-}
-
+dest <- "data/chopper.ply"
 mesh <- read.ply(dest)
 # see getS3method("shade3d", "mesh3d") for details on how to plot
 
diff --git a/r/2017-01-19-buttons.Rmd b/r/2017-01-19-buttons.Rmd
@@ -343,8 +343,8 @@ library(plotly)
 # Sys.setenv('MAPBOX_TOKEN' = 'your mapbox token')
 
 # read in wind turbines and farms data
-df_wind = read.csv('https://plot.ly/~datasets/2805.csv')
-df_farms = read.csv('https://plot.ly/~jackp/17256.csv')
+df_wind = read.csv('data/2805.csv')
+df_farms = read.csv('https://plot.ly/~jackp/17256.csv', skipNul = TRUE)
 
 # subset and clean data
 df_sub <- subset(df_wind, manufac != "unknown", select=c(lat_DD, long_DD, manufac))
diff --git a/r/data/2805.csv b/r/data/2805.csv
diff --git a/r/data/chopper.ply b/r/data/chopper.ply

-Original file line number
+Diff line change
     readr,
     MASS,
     htmltools,
 +    random,
     tidyr,
     broom,
     cli,