From 39a1ad0d36dbe53da00cb4eda287816a7fa32a6a Mon Sep 17 00:00:00 2001
From: Carlos Herrero <contact@carloshb.com>
Date: Sun, 19 Feb 2023 21:35:57 +0100
Subject: [PATCH] Fix build test

---
 .github/workflows/build.yml | 55 +++++++++++++++++++++----------------
 pyproject.toml              |  2 +-
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e56dd5a..e01523a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,46 +2,49 @@ name: Build
 
 on:
   push:
-    branches: master
+    branches: main
   pull_request:
     branches: '*'
 
 jobs:
   build:
     runs-on: ubuntu-latest
+
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Base Setup
       uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
 
     - name: Install dependencies
-      run: python -m pip install -U check-manifest jupyterlab
+      run: python -m pip install -U "jupyterlab>=3.0,<3.6"
 
     - name: Build the extension
       run: |
         set -eux
-        # TODO: add lint check
-        #pushd js
-        #jlpm
-        #jlpm run eslint:check
-        #popd
-        
         python -m pip install .
+
+        #jupyter server extension list
+        #jupyter server extension list 2>&1 | grep -ie "jupyros.*OK"
+
         jupyter labextension list
         jupyter labextension list 2>&1 | grep -ie "@robostack/jupyter-ros.*OK"
         python -m jupyterlab.browser_check
-        check-manifest -v
+
+    - name: Package the extension
+      run: |
+        set -eux
         pip install build
-        python -m build --sdist
-        cp dist/*.tar.gz myextension.tar.gz
+        python -m build
         pip uninstall -y "jupyros" jupyterlab
-        rm -rf myextension
-    - uses: actions/upload-artifact@v2
+    
+    - name: Upload extension packages
+      uses: actions/upload-artifact@v3
       with:
-        name: myextension-sdist
-        path: myextension.tar.gz
+        name: extension-artifacts
+        path: dist/jupyros*
+        if-no-files-found: error
 
   test_isolated:
     needs: build
@@ -49,22 +52,26 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Install Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
-        python-version: '3.8'
+        python-version: '3.9'
         architecture: 'x64'
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
-        name: myextension-sdist
+        name: extension-artifacts
     - name: Install and Test
       run: |
         set -eux
         # Remove NodeJS, twice to take care of system and locally installed node versions.
         sudo rm -rf $(which node)
         sudo rm -rf $(which node)
-        pip install myextension.tar.gz
-        pip install jupyterlab
+        pip install "jupyterlab>=3.0,<3.6" jupyros*.whl
+
+        #jupyter server extension list
+        #jupyter server extension list 2>&1 | grep -ie "jupyros.*OK"
+
+        jupyter labextension list
         jupyter labextension list 2>&1 | grep -ie "@robostack/jupyter-ros.*OK"
-        python -m jupyterlab.browser_check --no-browser-test
\ No newline at end of file
+        python -m jupyterlab.browser_check --no-chrome-test
diff --git a/pyproject.toml b/pyproject.toml
index 004b2f0..bf5f316 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -91,7 +91,7 @@ version_cmd = "hatch version"
 [tool.jupyter-releaser.hooks]
 before-bump-version = ["python -m pip install --pre -U 'jupyterlab>=3.0,<3.6'", "cd js && jlpm"]
 before-build-npm = ["cd js && jlpm build:prod"]
-before-build-python = ["ls -la", "cd js && jlpm clean", "ls -la", "cd js && jlpm build:prod"]
+before-build-python = ["cd js && jlpm build:prod"]
 
 [tool.check-wheel-contents]
 ignore = ["W002"]