wip ci

Author: meihuisu

.github/scripts/canvas-test-ucvm.sh

@@ -4,7 +4,8 @@
 
 cd test
 
-make run_unit |& tee result_unit.txt
+make run_unit >& result_unit.txt
+cat result_unit.txt
 
 p=`grep -c failed result_unit.txt`
 if [ $p != 0 ]; then

.github/workflows/canvas-ucvm-ci.yml

@@ -16,25 +16,19 @@ jobs:
     - name: set UCVM_INSTALL_PATH 
       run: echo "UCVM_INSTALL_PATH=$RUNNER_WORKSPACE/canvas/target" >> $GITHUB_ENV
 ### build ucvm(main) first 
-    - id: get-ucvm 
+    - name: get-ucvm 
       uses: actions/checkout@v2
       with: 
         repository: 'SCECcode/UCVM'
         ref: testMei
         path: ucvm
     - id: build-ucvm
+      name: build ucvm
       uses: ./ucvm/.github/actions/build-ucvm-action
       with:
          initiating-repo: 'canvas'
          target-model: 'canvas'
-#   - name: Start SSH via Ngrok
-#     if: ${{ failure() }}
-#     uses: luchihoratiu/debug-via-ssh@main
-#     with:
-#           NGROK_AUTH_TOKEN: ${{ secrets.NGROK_TOKEN }}
-#           NGROK_TIMEOUT: 3000
-#           SSH_PASS: ${{ secrets.NGROK_SECRET }}
-    - id: get-result
+    - name: get-result
       run: more ${{ steps.build-ucvm.outputs.build-log }}
       shell: bash
     - name: move stock canvas away
@@ -58,16 +52,62 @@ jobs:
     - name: test canvas with ucvm
       run: (cd $RUNNER_WORKSPACE/canvas/ucvm/work/model/canvas; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/canvas-test-ucvm.sh)
       shell: bash
-#    - name: Start SSH via Ngrok
-#      if: ${{ success() }}
-#      uses: luchihoratiu/debug-via-ssh@main
-#      with:
-#            NGROK_AUTH_TOKEN: ${{ secrets.NGROK_TOKEN }}
-#            NGROK_TIMEOUT: 3000
-#            SSH_PASS: ${{ secrets.NGROK_SECRET }}
     - name: test canvas under ucvm
       run: (cd $RUNNER_WORKSPACE/canvas/ucvm; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/ucvm-test.sh)
       shell: bash
 
+  canvas-build-ucvm-mac:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        python-version: [3.7]
+    steps:
+    - name: set UCVM_SRC_PATH 
+      run: echo "UCVM_SRC_PATH=$RUNNER_WORKSPACE/canvas/ucvm" >> $GITHUB_ENV
+    - name: set UCVM_INSTALL_PATH 
+      run: echo "UCVM_INSTALL_PATH=$RUNNER_WORKSPACE/canvas/target" >> $GITHUB_ENV
+### build ucvm(main) first 
+    - name: get-ucvm 
+      uses: actions/checkout@v2
+      with: 
+        repository: 'SCECcode/UCVM'
+        ref: testMei
+        path: ucvm
+    - id: build-ucvm
+      name: build ucvm
+      uses: ./ucvm/.github/actions/build-ucvm-action
+      with:
+         initiating-repo: 'canvas'
+         target-model: 'canvas'
+    - name: get-result
+      run: more ${{ steps.build-ucvm.outputs.build-log }}
+      shell: bash
+    - name: move stock canvas away
+      run: (rm -rf $RUNNER_WORKSPACE/canvas/ucvm/work/model/canvas)
+      shell: bash
+### build canvas from github 
+    - name: checkout canvas main
+      uses: actions/checkout@v2
+      with: 
+        path: canvas
+    - name: move it to the right location
+      run: (mv canvas $RUNNER_WORKSPACE/canvas/ucvm/work/model; pwd; ls)
+      shell: bash
+    - name: build canvas as part of ucvm 
+      run: (cd $RUNNER_WORKSPACE/canvas/ucvm/work/model/canvas; ./.github/scripts/canvas-build.sh)
+      shell: bash
+### check ucvm is still valid
+    - name: check on ucvm
+      run: (source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ucvm_query -H)
+      shell: bash
+    - name: test canvas with ucvm
+      run: (cd $RUNNER_WORKSPACE/canvas/ucvm/work/model/canvas; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/canvas-test-ucvm.sh)
+      shell: bash
+    - name: test canvas under ucvm
+      run: (cd $RUNNER_WORKSPACE/canvas/ucvm; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/ucvm-test.sh)
+      shell: bash
+
+
+