fix ci

meihuisu · meihuisu · commit 1771e7ca67d3 · 2025-05-20T05:10:45.000Z
diff --git a/.github/workflows/cvmhibbn-ci.yml b/.github/workflows/cvmhibbn-ci.yml
@@ -2,7 +2,7 @@ name: cvmhibbn-ci
 
 on:
   push:
-    branches: [ foo ]
+    branches: [ main ]
 
 jobs:
   cvmhibbn-build-standalone-mac:
diff --git a/.github/workflows/cvmhibbn-ucvm-ci.yml b/.github/workflows/cvmhibbn-ucvm-ci.yml
@@ -141,7 +141,7 @@ jobs:
       run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; ./.github/scripts/cvmhbn-test-standalone.sh cvmhibbn)
       shell: bash
     - name: test cvmhibbn with ucvm
-      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh)
+      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh cvmhibbn)
       shell: bash
 #    - name: Start SSH via Ngrok
 #      if: ${{ success() }}
diff --git a/.github/workflows/cvmhlabn-ci.yml b/.github/workflows/cvmhlabn-ci.yml
@@ -2,7 +2,7 @@ name: cvmhlabn-ci
 
 on:
   push:
-    branches: [ foo ]
+    branches: [ main ]
 
 jobs:
   cvmhlabn-build-standalone-mac:
diff --git a/.github/workflows/cvmhlabn-ucvm-ci.yml b/.github/workflows/cvmhlabn-ucvm-ci.yml
@@ -141,7 +141,7 @@ jobs:
       run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; ./.github/scripts/cvmhbn-test-standalone.sh cvmhlabn)
       shell: bash
     - name: test cvmhlabn with ucvm
-      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh)
+      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh cvmhlabn)
       shell: bash
 #    - name: Start SSH via Ngrok
 #      if: ${{ success() }}
diff --git a/.github/workflows/cvmhrbn-ci.yml b/.github/workflows/cvmhrbn-ci.yml
@@ -2,7 +2,7 @@ name: cvmhrbn-ci
 
 on:
   push:
-    branches: [ foo ]
+    branches: [ main ]
 
 jobs:
   cvmhrbn-build-standalone-mac:
diff --git a/.github/workflows/cvmhrbn-ucvm-ci.yml b/.github/workflows/cvmhrbn-ucvm-ci.yml
@@ -66,7 +66,7 @@ jobs:
       run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; ./.github/scripts/cvmhbn-test-standalone.sh cvmhrbn)
       shell: bash
     - name: test cvmhrbn with ucvm
-      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh)
+      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh cvmhrbn)
       shell: bash
 #    - name: Start SSH via Ngrok
 #      if: ${{ success() }}
diff --git a/.github/workflows/cvmhsbbn-ci.yml b/.github/workflows/cvmhsbbn-ci.yml
@@ -2,7 +2,7 @@ name: cvmhsbbn-ci
 
 on:
   push:
-    branches: [ foo ]
+    branches: [ main ]
 
 jobs:
   cvmhsbbn-build-standalone-mac:
diff --git a/.github/workflows/cvmhsbbn-ucvm-ci.yml b/.github/workflows/cvmhsbbn-ucvm-ci.yml
@@ -141,7 +141,7 @@ jobs:
       run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; ./.github/scripts/cvmhbn-test-standalone.sh cvmhsbbn)
       shell: bash
     - name: test cvmhsbbn with ucvm
-      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh)
+      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh cvmhsbbn)
       shell: bash
 #    - name: Start SSH via Ngrok
 #      if: ${{ success() }}
diff --git a/.github/workflows/cvmhsbcbn-ci.yml b/.github/workflows/cvmhsbcbn-ci.yml
@@ -2,7 +2,7 @@ name: cvmhsbcbn-ci
 
 on:
   push:
-    branches: [ foo ]
+    branches: [ main ]
 
 jobs:
   cvmhsbcbn-build-standalone-mac:
diff --git a/.github/workflows/cvmhsbcbn-ucvm-ci.yml b/.github/workflows/cvmhsbcbn-ucvm-ci.yml
@@ -141,7 +141,7 @@ jobs:
       run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; ./.github/scripts/cvmhbn-test-standalone.sh cvmhsbcbn)
       shell: bash
     - name: test cvmhsbcbn with ucvm
-      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh)
+      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh cvmhsbcbn)
       shell: bash
 #    - name: Start SSH via Ngrok
 #      if: ${{ success() }}
diff --git a/.github/workflows/cvmhsgbn-ci.yml b/.github/workflows/cvmhsgbn-ci.yml
@@ -2,7 +2,7 @@ name: cvmhsgbn-ci
 
 on:
   push:
-    branches: [ foo ]
+    branches: [ main ]
 
 jobs:
   cvmhsgbn-build-standalone-mac:
diff --git a/.github/workflows/cvmhsgbn-ucvm-ci.yml b/.github/workflows/cvmhsgbn-ucvm-ci.yml
@@ -66,7 +66,7 @@ jobs:
       run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; ./.github/scripts/cvmhbn-test-standalone.sh cvmhsgbn)
       shell: bash
     - name: test cvmhsgbn with ucvm
-      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh cvmhsbcbn)
+      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh cvmhsgbn)
       shell: bash
 #    - name: Start SSH via Ngrok
 #      if: ${{ success() }}
@@ -141,7 +141,7 @@ jobs:
       run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; ./.github/scripts/cvmhbn-test-standalone.sh cvmhsgbn)
       shell: bash
     - name: test cvmhsgbn with ucvm
-      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh)
+      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh cvmhsgbn)
       shell: bash
 #    - name: Start SSH via Ngrok
 #      if: ${{ success() }}
diff --git a/.github/workflows/cvmhsmbn-ci.yml b/.github/workflows/cvmhsmbn-ci.yml
@@ -23,13 +23,13 @@ jobs:
     - name: build cvmhsmbn 
       run: ./.github/scripts/cvmhbn-build.sh cvmhsmbn 
       shell: bash
-    - 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 }}
+#   - 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 }}
     - name: test cvmhsmbn standalone
       run: ./.github/scripts/cvmhbn-test-standalone.sh cvmhsmbn
       shell: bash
@@ -54,13 +54,13 @@ jobs:
     - name: build cvmhsmbn
       run: ./.github/scripts/cvmhbn-build.sh cvmhsmbn
       shell: bash
-    - 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 }}
+#   - 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 }}
     - name: test cvmhsmbn standalone
       run: ./.github/scripts/cvmhbn-test-standalone.sh cvmhsmbn
       shell: bash
diff --git a/.github/workflows/cvmhsmbn-ucvm-ci.yml b/.github/workflows/cvmhsmbn-ucvm-ci.yml
@@ -7,82 +7,82 @@ on:
         - completed
 
 jobs:
-# cvmhsmbn-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/cvmhbn/ucvm" >> $GITHUB_ENV
-#   - name: set UCVM_INSTALL_PATH 
-#     run: echo "UCVM_INSTALL_PATH=$RUNNER_WORKSPACE/cvmhbn/target" >> $GITHUB_ENV
+  cvmhsmbn-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/cvmhbn/ucvm" >> $GITHUB_ENV
+    - name: set UCVM_INSTALL_PATH 
+      run: echo "UCVM_INSTALL_PATH=$RUNNER_WORKSPACE/cvmhbn/target" >> $GITHUB_ENV
 ### build ucvm(main) first 
-#   - id: get-ucvm 
-#     uses: actions/checkout@v2
-#     with: 
-#       repository: 'SCECcode/UCVM'
-#       ref: testMei
-#       path: ucvm
-#   - id: look-around
-#     run: ( echo " cvmhsmbn-ucvm-ci:pwd =>";pwd;
-#            echo " cvmhsmbn-ucvm-ci:UCVM_SRC_PATH =>"$UCVM_SRC_PATH;
-#            echo " cvmhsmbn-ucvm-ci:UCVM_INSTALL_PATH =>"$UCVM_INSTALL_PATH;
-#            echo " cvmhsmbn-ucvm-ci:RUNNER_WORKSPACE =>"$RUNNER_WORKSPACE;
-#            echo " cvmhsmbn-ucvm-ci:github.action_path =>"${{ github.action_path }};)
-#     shell: bash
-#   - id: build-ucvm
-#     uses: ./ucvm/.github/actions/build-ucvm-action
-#     with:
-#        initiating-repo: 'cvmhsmbn'
-#        target-model: 'cvmhsmbn'
-#   - id: get-result
-#     run: more ${{ steps.build-ucvm.outputs.build-log }}
-#     shell: bash
-#   - name: move stock cvmhsmbn away
-#     run: (rm -rf $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhsmbn)
-#     shell: bash
+    - id: get-ucvm 
+      uses: actions/checkout@v2
+      with: 
+        repository: 'SCECcode/UCVM'
+        ref: testMei
+        path: ucvm
+    - id: look-around
+      run: ( echo " cvmhsmbn-ucvm-ci:pwd =>";pwd;
+             echo " cvmhsmbn-ucvm-ci:UCVM_SRC_PATH =>"$UCVM_SRC_PATH;
+             echo " cvmhsmbn-ucvm-ci:UCVM_INSTALL_PATH =>"$UCVM_INSTALL_PATH;
+             echo " cvmhsmbn-ucvm-ci:RUNNER_WORKSPACE =>"$RUNNER_WORKSPACE;
+             echo " cvmhsmbn-ucvm-ci:github.action_path =>"${{ github.action_path }};)
+      shell: bash
+    - id: build-ucvm
+      uses: ./ucvm/.github/actions/build-ucvm-action
+      with:
+         initiating-repo: 'cvmhsmbn'
+         target-model: 'cvmhsmbn'
+    - id: get-result
+      run: more ${{ steps.build-ucvm.outputs.build-log }}
+      shell: bash
+    - name: move stock cvmhsmbn away
+      run: (rm -rf $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhsmbn)
+      shell: bash
 ### get cvmhbn from github 
-#   - name: checkout cvmhbn main
-#     uses: actions/checkout@v2
-#     with: 
-#       ref: main
-#       path: cvmhbn
-#   - name: move it to the right location
-#     run: (mv cvmhbn $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model)
-#     shell: bash
+    - name: checkout cvmhbn main
+      uses: actions/checkout@v2
+      with: 
+        ref: main
+        path: cvmhbn
+    - name: move it to the right location
+      run: (mv cvmhbn $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model)
+      shell: bash
 ### build cvmhsmbn from cvmhbn
-#   - name: build cvmhsmbn main
-#     run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; ./.github/scripts/cvmhbn-generate.sh cvmhsmbn)
-#     shell: bash
-#   - name: build cvmhsmbn as part of ucvm
-#     run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; ./.github/scripts/cvmhbn-build.sh cvmhsmbn)
-#     shell: bash
+    - name: build cvmhsmbn main
+      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; ./.github/scripts/cvmhbn-generate.sh cvmhsmbn)
+      shell: bash
+    - name: build cvmhsmbn as part of ucvm
+      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; ./.github/scripts/cvmhbn-build.sh cvmhsmbn)
+      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 cvmhsmbn standalone
-#     run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; ./.github/scripts/cvmhbn-test-standalone.sh cvmhsmbn)
-#     shell: bash
-#   - name: test cvmhsmbn with ucvm
-#     run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh cvmhsmbn)
-#     shell: bash
+    - name: check on ucvm
+      run: (source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ucvm_query -H)
+      shell: bash
+    - name: test cvmhsmbn standalone
+      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; ./.github/scripts/cvmhbn-test-standalone.sh cvmhsmbn)
+      shell: bash
+    - name: test cvmhsmbn with ucvm
+      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh cvmhsmbn)
+      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 cvmhsmbn under ucvm
-#     run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/ucvm-test.sh)
-#     shell: bash
+    - name: test cvmhsmbn under ucvm
+      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/ucvm-test.sh)
+      shell: bash
 
 
   cvmhsmbn-build-ucvm-linux:
     if: ${{ success() }}
-#   needs: [cvmhsmbn-build-ucvm-mac]
+    needs: [cvmhsmbn-build-ucvm-mac]
     runs-on: ubuntu-latest
     strategy:
       matrix:
diff --git a/.github/workflows/cvmhstbn-ci.yml b/.github/workflows/cvmhstbn-ci.yml
@@ -2,7 +2,7 @@ name: cvmhstbn-ci
 
 on:
   push:
-    branches: [ foo ]
+    branches: [ main ]
 
 jobs:
   cvmhstbn-build-standalone-mac:
diff --git a/.github/workflows/cvmhstbn-ucvm-ci.yml b/.github/workflows/cvmhstbn-ucvm-ci.yml
@@ -141,7 +141,7 @@ jobs:
       run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; ./.github/scripts/cvmhbn-test-standalone.sh cvmhstbn)
       shell: bash
     - name: test cvmhstbn with ucvm
-      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh)
+      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh cvmhstbn)
       shell: bash
 #    - name: Start SSH via Ngrok
 #      if: ${{ success() }}
diff --git a/.github/workflows/cvmhvbn-ci.yml b/.github/workflows/cvmhvbn-ci.yml
@@ -2,7 +2,7 @@ name: cvmhvbn-ci
 
 on:
   push:
-    branches: [ foo ]
+    branches: [ main ]
 
 jobs:
   cvmhvbn-build-standalone-mac:
diff --git a/.github/workflows/cvmhvbn-ucvm-ci.yml b/.github/workflows/cvmhvbn-ucvm-ci.yml
@@ -66,7 +66,7 @@ jobs:
       run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; ./.github/scripts/cvmhbn-test-standalone.sh cvmhvbn)
       shell: bash
     - name: test cvmhvbn with ucvm
-      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh)
+      run: (cd $RUNNER_WORKSPACE/cvmhbn/ucvm/work/model/cvmhbn; source $UCVM_INSTALL_PATH/conf/ucvm_env.sh; ./.github/scripts/cvmhbn-test-ucvm.sh cvmhvbn)
       shell: bash
 #    - name: Start SSH via Ngrok
 #      if: ${{ success() }}
