Merge branch 'develop' of https://github.com/informatici/openhospital…

…-api into OP-1311_move_settings_to_db
informatici · Oct 30, 2024 · 671733a · 671733a
2 parents 8d44b88 + e7da5dd
commit 671733a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -30,14 +30,15 @@ jobs:
           # Set default FORK_REPO and BRANCH_NAME values.
           BRANCH_NAME="${GITHUB_HEAD_REF:-${GITHUB_REF##*/}}"
           FORK_REPO="${GITHUB_HEAD_REPOSITORY:-${GITHUB_ACTOR}/openhospital-core}"
-          CHECK_BRANCH_URL="https://github.com/${GITHUB_ACTOR}/tree/$BRANCH_NAME"
+          CHECK_BRANCH_URL="https://github.com/${GITHUB_ACTOR}/openhospital-core/tree/$BRANCH_NAME"
+          echo "Checking branch existence with: curl -s -o /dev/null -w \"%{http_code}\" $CHECK_BRANCH_URL"
           
           # Determine FORK_REPO with fallback logic
           if [[ -n "${GITHUB_HEAD_REPOSITORY}" ]]; then
             echo "Using ${GITHUB_HEAD_REPOSITORY}."
             FORK_REPO=${GITHUB_HEAD_REPOSITORY}
           elif curl -s -o /dev/null -w "%{http_code}" $CHECK_BRANCH_URL | grep -q "200"; then
-            echo "Checking branch existence with: curl -s -o /dev/null -w \"%{http_code}\" $CHECK_BRANCH_URL"
+            echo "Using ${GITHUB_ACTOR}/openhospital-core"
             FORK_REPO=${GITHUB_ACTOR}/openhospital-core
           else
             echo "Using informatici/openhospital-core."

diff --git a/.github/workflows/openapi.yml b/.github/workflows/openapi.yml
@@ -29,21 +29,27 @@ jobs:
       - name: Determine PR source branch and fork repository
         id: vars
         run: |
-          # Set BRANCH_NAME based on event type
-          if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then
-            echo "BRANCH_NAME=${GITHUB_HEAD_REF}" >> $GITHUB_ENV
-          else
-            echo "BRANCH_NAME=${GITHUB_REF##*/}" >> $GITHUB_ENV
-          fi
-
+          # Set default FORK_REPO and BRANCH_NAME values.
+          BRANCH_NAME="${GITHUB_HEAD_REF:-${GITHUB_REF##*/}}"
+          FORK_REPO="${GITHUB_HEAD_REPOSITORY:-${GITHUB_ACTOR}/openhospital-core}"
+          CHECK_BRANCH_URL="https://github.com/${GITHUB_ACTOR}/openhospital-core/tree/$BRANCH_NAME"
+          echo "Checking branch existence with: curl -s -o /dev/null -w \"%{http_code}\" $CHECK_BRANCH_URL"
+          
           # Determine FORK_REPO with fallback logic
           if [[ -n "${GITHUB_HEAD_REPOSITORY}" ]]; then
-            echo "FORK_REPO=${GITHUB_HEAD_REPOSITORY}" >> $GITHUB_ENV
-          elif curl -s --head https://github.com/${GITHUB_ACTOR}/openhospital-core/tree/${BRANCH_NAME} | grep "HTTP/[12].* 2[0-9][0-9]" > /dev/null; then
-            echo "FORK_REPO=${GITHUB_ACTOR}/openhospital-core" >> $GITHUB_ENV
+            echo "Using ${GITHUB_HEAD_REPOSITORY}."
+            FORK_REPO=${GITHUB_HEAD_REPOSITORY}
+          elif curl -s -o /dev/null -w "%{http_code}" $CHECK_BRANCH_URL | grep -q "200"; then
+            echo "Using ${GITHUB_ACTOR}/openhospital-core"
+            FORK_REPO=${GITHUB_ACTOR}/openhospital-core
           else
-            echo "FORK_REPO=informatici/openhospital-core" >> $GITHUB_ENV
+            echo "Using informatici/openhospital-core."
+            FORK_REPO="informatici/openhospital-core"
           fi
+          
+          # Export FORK_REPO and BRANCH_NAME to GITHUB_ENV for the next step
+          echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
+          echo "FORK_REPO=$FORK_REPO" >> $GITHUB_ENV
 
       - name: Log variables
         run: |