more rio cleanup (jupyter-server#70)

Zsailer · Aug 17, 2021 · 9e152a1 · 9e152a1
1 parent fa21ce3
commit 9e152a1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git 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
@@ -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: