Merge branch 'main' into lucas/generics-con-args

Author: quark17

.github/workflows/build-and-test-macos.yml

@@ -235,6 +235,8 @@ jobs:
         run: "tar xzf inst.tar.gz"
 
       - name: Download Toooba
+        env:
+          HEAD_OWNER: ${{ github.event.pull_request.head.repo.owner.login }}
         run: .github/workflows/checkout_possible_branch.sh bluespec Toooba
 
       # Restore previous ccache cache of compiled object files. Use a SHA
@@ -313,6 +315,8 @@ jobs:
         run: "tar xzf inst.tar.gz"
 
       - name: Download bsc-contrib
+        env:
+          HEAD_OWNER: ${{ github.event.pull_request.head.repo.owner.login }}
         run: .github/workflows/checkout_possible_branch.sh B-Lang-org bsc-contrib
 
       - name: Build and install bsc-contrib
@@ -385,6 +389,8 @@ jobs:
         run: "tar xzf inst.tar.gz"
 
       - name: Download bdw
+        env:
+          HEAD_OWNER: ${{ github.event.pull_request.head.repo.owner.login }}
         run: .github/workflows/checkout_possible_branch.sh B-Lang-org bdw
 
       - name: Build and install bdw

.github/workflows/build-and-test-ubuntu.yml

@@ -208,6 +208,8 @@ jobs:
         run: "tar xzf inst.tar.gz"
 
       - name: Download Toooba
+        env:
+          HEAD_OWNER: ${{ github.event.pull_request.head.repo.owner.login }}
         run: .github/workflows/checkout_possible_branch.sh bluespec Toooba
 
       # Restore previous ccache cache of compiled object files. Use a SHA
@@ -281,6 +283,8 @@ jobs:
         run: "tar xzf inst.tar.gz"
 
       - name: Download bsc-contrib
+        env:
+          HEAD_OWNER: ${{ github.event.pull_request.head.repo.owner.login }}
         run: .github/workflows/checkout_possible_branch.sh B-Lang-org bsc-contrib
 
       - name: Build and install bsc-contrib
@@ -358,6 +362,8 @@ jobs:
         run: "tar xzf inst.tar.gz"
 
       - name: Download bdw
+        env:
+          HEAD_OWNER: ${{ github.event.pull_request.head.repo.owner.login }}
         run: .github/workflows/checkout_possible_branch.sh B-Lang-org bdw
 
       - name: Build and install bdw

.github/workflows/checkout_possible_branch.sh

@@ -17,25 +17,30 @@ default_checkout () {
 
 user_branch_checkout () {
     if [ "$2" = "main" ]; then
-	default_checkout
+        default_checkout
     else
-	CMD="git ls-remote --heads https://github.com/$1/${REPO} refs/heads/$2"
-	echo "Trying: $CMD"
-	SEARCH_RES=`$CMD`
-	echo "Result: ${SEARCH_RES}"
-	if [ -z "${SEARCH_RES}" ]; then
+        CMD="git ls-remote --heads https://github.com/$1/${REPO} refs/heads/$2"
+        echo "Trying: $CMD"
+        SEARCH_RES=`$CMD || echo`
+        echo "Result: ${SEARCH_RES}"
+        if [ -z "${SEARCH_RES}" ]; then
             default_checkout
-	else
+        else
             echo "Checking out user's branch"
             git clone --recursive https://github.com/$1/${REPO} ../${REPO}
             cd ../${REPO}
             git checkout "$2"
-	fi
+        fi
     fi
 }
 
 if [ "${GITHUB_EVENT_NAME}" = "pull_request" ]; then
-    user_branch_checkout "${GITHUB_ACTOR}" "${GITHUB_HEAD_REF}"
+    if [ -z "${HEAD_OWNER}" ] ; then
+        echo "HEAD_OWNER not defined in environment"
+        echo "use ${{ github.event.pull_request.head.repo.owner.login }}"
+        exit 1
+    fi
+    user_branch_checkout "${HEAD_OWNER}" "${GITHUB_HEAD_REF}"
 elif [ "${GITHUB_EVENT_NAME}" = "push" ]; then
     user_branch_checkout "${GITHUB_ACTOR}" "${GITHUB_REF_NAME}"
 else