fix conflicts (#105)

.github/workflows/validate-pull.yml

@@ -57,15 +57,46 @@ jobs:
                 fi
             done
 
-  docker-build-pull:
+  nightly-version:
     runs-on: ubuntu-latest
     needs: [ validate-pull ]
     if: needs.validate-pull.outputs.build == 'true' && (contains(github.event.pull_request.labels.*.name, 'docker') || contains(github.event.pull_request.labels.*.name, 'tester'))
+    steps:
+
+      - name: Create App Token
+        uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ vars.APP_ID }}
+          private-key: ${{ secrets.APP_TOKEN }}
+
+      - name: Check Out Repo
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.PAT }}
+          ref: nightly
+
+      - name: Current Nightly Version
+        id: nightly-version
+        run: |
+            value=$(cat VERSION)
+            if [[ "$value" == *"-"* ]]; then
+                value2="${value#*-build}"
+            else
+                value2="0"
+            fi
+            echo "build-value=${value2}" >> $GITHUB_OUTPUT
+
+  docker-build-pull:
+    runs-on: ubuntu-latest
+    needs: [ validate-pull, nightly-version ]
+    if: needs.validate-pull.outputs.build == 'true' && (contains(github.event.pull_request.labels.*.name, 'docker') || contains(github.event.pull_request.labels.*.name, 'tester'))
     outputs:
       commit-msg: ${{ steps.update-version.outputs.commit-msg }}
       version: ${{ steps.update-version.outputs.version }}
       tag-name: ${{ steps.update-version.outputs.tag-name }}
       extra-text: ${{ steps.update-version.outputs.extra-text }}
+      nightly-version: ${{ steps.nightly-version.outputs.build-value }}
     steps:
 
       - name: Create App Token
@@ -121,7 +152,7 @@ jobs:
                 part_value="1"
             fi
 
-            new_value="${version}-build${build_value}.${part_value}"
+            new_value="${version}-build${{ needs.docker-build-pull.outputs.commit-msg }}.${part_value}"
             echo "version=${new_value}" >> $GITHUB_OUTPUT
 
             echo "$new_value" > "VERSION"