check library commit on correct branch

Signed-off-by: tobiasKaminsky <[email protected]>
nextcloud · Jan 23, 2025 · 782d59c · 782d59c
1 parent a4c48a8
commit 782d59c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/detectWrongSettings.yml b/.github/workflows/detectWrongSettings.yml
@@ -27,4 +27,4 @@ jobs:
                     distribution: "temurin"
                     java-version: 17
             -   name: Detect SNAPSHOT
-                run: scripts/analysis/detectWrongSettings.sh
+                run: scripts/analysis/detectWrongSettings.sh ${{ github.event.number }}
diff --git a/scripts/analysis/detectWrongSettings.sh b/scripts/analysis/detectWrongSettings.sh
@@ -8,7 +8,8 @@ snapshotCount=$(./gradlew dependencies | grep SNAPSHOT -c)
 betaCount=$(grep "<bool name=\"is_beta\">true</bool>" app/src/main/res/values/setup.xml -c)
 libraryHash=$(grep androidLibraryVersion build.gradle | cut -d= -f2 | tr -d \")
 
-lastHashes=$(curl https://api.github.com/repos/nextcloud/android-library/commits | jq ".[] .sha" | head -n 10)
+baseBranch=$(getBranchBase.sh "$1" | sed 's/"//g')
+lastHashes=$(curl "https://api.github.com/repos/nextcloud/android-library/commits?sha=$baseBranch") | jq ".[] .sha" | head -n 10)
 
 if [[ $(echo "$lastHashes"  | grep -c $libraryHash) -ne 1  ]]; then
     echo "Library commit not within last 10 hashes, please rebase!"