From 9e152a1b54e5c6354d48a7a43a7c62ace1a494b7 Mon Sep 17 00:00:00 2001
From: Steve Silvester <ssilvester@apple.com>
Date: Tue, 17 Aug 2021 06:23:33 -0500
Subject: [PATCH] more rio cleanup (#70)

---
 build.sh |  8 ++++++++
 rio.yml  | 18 ++++--------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/build.sh b/build.sh
index b47e45b0b2..06d8c97d37 100755
--- a/build.sh
+++ b/build.sh
@@ -45,3 +45,11 @@ mkdir -p ${CONFIG_DIR}
 cat <<EOF >> ${CONFIG_DIR}/jupyter_server_config.json
 { "ServerApp": { "allow_root": true } }
 EOF
+
+make install
+
+if [[ $1 == "build" ]]; then
+    make test
+else if [[ $1 == "publish" ]]; then
+    python -m build
+fi
diff --git a/rio.yml b/rio.yml
index 3c2a2e5110..1c35f8ad67 100644
--- a/rio.yml
+++ b/rio.yml
@@ -2,31 +2,21 @@ schemaVersion: 2.0
 
 pipelines:
   - branchName: main
+    machine:
+      baseImage: docker.apple.com/rio/fuji-bdz:latest
     build:
       template: freestyle:v4:prb
       steps:
-        - ./build.sh
-        - conda activate data_studio_jupyter_extensions
-        - make install
-        - make test
-    machine:
-      baseImage: docker.apple.com/rio/fuji-bdz:latest
+        - ./build.sh build
 
   - name: pypi-release
     branchName: main
     machine:
       baseImage: docker.apple.com/rio/fuji-bdz:latest
-      env:
-        PYTHON_VERSION: python-3.8.7
-        PIP_INDEX_URL: https://pypi.apple.com/simple
-        PIP_EXTRA_INDEX_URL: -https://pypi.apple.com/simple
     build:
       template: freestyle:v4:publish
       steps:
-        - ./build.sh
-        - conda activate data_studio_jupyter_extensions
-        - make install
-        - python -m build
+        - ./build.sh publish
         - ci stage-lib "dist/**"
     package:
       freeform: