Added selftest, reverted .travis.yml

AcademySoftwareFoundation · Sep 19, 2019 · 6e1fa90 · 6e1fa90
1 parent 484d239
commit 6e1fa90
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/install-as-package-test.yml b/.github/workflows/install-as-package-test.yml
@@ -7,11 +7,10 @@ jobs:
     name: Ubuntu - install prod. venv
     runs-on: ubuntu-latest
     strategy:
-      max-parallel: 4
       matrix:
         python-version: ['2.7', '3.7']
         package-name: ['rez', 'foo']
-        # python-version: [2.7, 3.5, 3.6, 3.7]
+        rez-shell: ['bash', 'tcsh']
 
     steps:
     - name: Checkout
@@ -52,4 +51,12 @@ jobs:
         rez bind python
         rez env ${{ matrix.package-name }} -- rez context
 
+    - name: rez-selftest
+      with:
+        _rez_shell: ${{ matrix.rez-shell }}
+      run: |
+        source setup-rez.sh
+        if [ "$_REZ_SHELL" == "tcsh" ]; then sudo apt-get install tcsh; fi
+        $(rez env ${{ matrix.package-name }} -- which rez-selftest) -s ${_REZ_SHELL}
+
     # - name: Install in Python Docker Image
diff --git a/.travis.yml b/.travis.yml
@@ -9,9 +9,6 @@ matrix:
 install:
   - 'if [ "$_REZ_SHELL" == "tcsh" ]; then sudo apt-get install tcsh; fi'
   - 'python ./install.py ../rez_install'
-  # Test with rez installed as "rez_install" and "rez" packages
-  - 'python ./install.py -p rez_install ../packages'
-  - 'python ./install.py -P ../packages'
 
 script:
-  - 'find ../rez_install/ ../packages/ -name rez-selftest -exec {} -s $_REZ_SHELL \;'
+  - '../rez_install/bin/rez/rez-selftest -s $_REZ_SHELL'