use branch

SCOREC · Mar 28, 2024 · fbedb1a · fbedb1a
1 parent 2c36d8a
commit fbedb1a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/globus-compute.py b/.github/workflows/globus-compute.py
@@ -20,11 +20,11 @@
 def run_test(name, build, branch):
     import subprocess
 
-    install = subprocess.run(["./install-test.sh "+name+" "+branch], shell=True, encoding="utf_8", stdout=subprocess.PIPE)
+    install = subprocess.run(["./install-test.sh "+name+" "+branch], shell=True, encoding="utf_8", stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     if install.returncode == 1:
         return (install, None, None)
 
-    summary = subprocess.run(["./run-test.sh "+name+" "+build], shell=True, encoding="utf_8", stdout=subprocess.PIPE)
+    summary = subprocess.run(["./run-test.sh "+name+" "+build], shell=True, encoding="utf_8", stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     if summary.returncode == 1:
         return (install, summary, None)
 
@@ -38,7 +38,6 @@ def run_test(name, build, branch):
 result = future.result()
 
 os.popen("mkdir -p "+name+"-result").read()
-
 with open(name+"-result/Build.log", "w") as text_file:
     text_file.write("%s" % result[0].stdout)
     text_file.close()

diff --git a/.github/workflows/perlmutter.yml b/.github/workflows/perlmutter.yml
@@ -34,7 +34,7 @@ jobs:
       run: |
         export FUNCX_SDK_CLIENT_ID="$GLOBUS_ID"
         export FUNCX_SDK_CLIENT_SECRET="$GLOBUS_SECRET"
-        python globus-compute.py master
+        python globus-compute.py ${{ github.sha }}
 
     - name: print build log
       working-directory: omega_h/.github/workflows