Merge branch 'yarp-3.4'

robotology · Mar 12, 2021 · c6adf01 · c6adf01
2 parents 5aec640 + ac1024f
commit c6adf01
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/.github/workflows/ci-debug.yml b/.github/workflows/ci-debug.yml
@@ -20,6 +20,9 @@ jobs:
       ref: ${{ steps.select.outputs.ref }}
       environment: ${{ steps.select.outputs.environment }}
       sha: ${{ steps.select.outputs.sha }}
+      head_ref: ${{ steps.select.outputs.head_ref }}
+      base_ref: ${{ steps.select.outputs.base_ref }}
+      pr_number: ${{ steps.select.outputs.pr_number }}
       yarp_version: ${{ steps.select.outputs.yarp_version }}
     steps:
     - name: "Set output variables"
@@ -38,6 +41,9 @@ jobs:
         fi
         if [[ "$GITHUB_EVENT_NAME" = "pull_request" || "$GITHUB_EVENT_NAME" == "pull_request_target" ]]; then
           echo "::set-output name=sha::${{ github.event.pull_request.head.sha }}"
+          echo "::set-output name=head_ref::${GITHUB_HEAD_REF}"
+          echo "::set-output name=base_ref::${GITHUB_BASE_REF}"
+          echo "::set-output name=pr_number::$(cat $GITHUB_EVENT_PATH | jq .number)"
         else
           echo "::set-output name=sha::${{ github.sha }}"
         fi
@@ -54,13 +60,19 @@ jobs:
         REF: ${{ steps.select.outputs.ref }}
         ENVIRONMENT: ${{ steps.select.outputs.environment }}
         SHA: ${{ steps.select.outputs.sha }}
+        HEAD_REF: ${{ steps.select.outputs.head_ref }}
+        BASE_REF: ${{ steps.select.outputs.base_ref }}
+        PR_NUMBER: ${{ steps.select.outputs.pr_number }}
         YARP_VERSION: ${{ steps.select.outputs.yarp_version }}
       run: |
         echo "TIMESTAMP = ${TIMESTAMP}"
         echo "REPOSITORY = ${REPOSITORY}"
         echo "REF = ${REF}"
         echo "ENVIRONMENT = ${ENVIRONMENT}"
         echo "SHA = ${SHA}"
+        echo "HEAD_REF = ${HEAD_REF}"
+        echo "BASE_REF = ${BASE_REF}"
+        echo "PR_NUMBER = ${PR_NUMBER}"
         echo "YARP_VERSION = ${YARP_VERSION}"
 
     - name: "Print Environment"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
       environment: ${{ steps.select.outputs.environment }}
       sha: ${{ steps.select.outputs.sha }}
       head_ref: ${{ steps.select.outputs.head_ref }}
-      head_ref: ${{ steps.select.outputs.base_ref }}
+      base_ref: ${{ steps.select.outputs.base_ref }}
       pr_number: ${{ steps.select.outputs.pr_number }}
       yarp_version: ${{ steps.select.outputs.yarp_version }}
     steps: