Signed-off-by: Günter Neiß <gneiss@web.de>

Author: gneiss15

.github/workflows/LinuxBuild.yml

@@ -67,13 +67,9 @@ jobs:
         cd ..
         TOOL="${GITHUB_WORKSPACE}/.github/tools/appimagetool-x86_64.AppImage"
         APPIMAGE_EXTRACT_AND_RUN=1 ARCH=x86_64 "${TOOL}" squashfs-root
-        #Error: No suitable fusermount binary found on the $PATH
-        #fuse: device not found, try 'modprobe fuse' first
-        #modprobe fuse
-        #ARCH=x86_64 ${TOOL} squashfs-root
         rm -r squashfs-root/
         rm "${EXE}"
-        mv *.AppImage ../
+        mv *.AppImage "${EXE}"
         cd ..
         rm -r t
     - name: Install gh and jq

.github/workflows/upstream-merge.yml

@@ -0,0 +1,74 @@
+name: Merge upstream/main into local main
+on:
+  schedule:
+    - cron: '0 3 * * *'  # täglich um 03:00 UTC
+  workflow_dispatch:
+jobs:
+  merge-upstream:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0  # wichtig, damit git alle Commits kennt
+    - name: Set up Git
+      run: |
+        git config user.name "github-actions"
+        git config user.email "github-actions@github.com"
+    - name: Add upstream remote
+      run: |
+        git remote add upstream https://github.com/arduino/arduino-ide.git
+        git fetch upstream
+    - name: Check for relevant changes (skip merge if only .github/ etc.)
+      id: check
+      run: |
+        git checkout main
+        git fetch upstream
+        #ROOT_FILES=$(grep -Ev '^\.github/|^\.git/|^[^/]+$')
+        DIFF_FILES=$(git diff --name-only upstream/main HEAD | grep -Ev '^(\.github/|\.git/|^[^/]+$)' || true)
+        echo "DIFF_FILES: $DIFF_FILES"
+        if [ -z "$DIFF_FILES" ]; then
+          echo "no_relevant_changes=true" >> $GITHUB_OUTPUT
+         else
+          echo "no_relevant_changes=false" >> $GITHUB_OUTPUT
+        fi
+    - name: Exit if no relevant changes
+      if: steps.check.outputs.no_relevant_changes == 'true'
+      run: |
+        echo "❎ Only ignored files changed. Exiting."
+        exit 0
+    - name: Merge upstream/main into local main
+      run: |
+        git merge upstream/main --no-edit
+      continue-on-error: true  # erlaubt Fehler z. B. bei Konflikten
+    - name: Check for merge conflicts
+      run: |
+        if git ls-files -u | grep .; then
+          echo "❌ Merge conflicts detected!"
+          exit 1
+        fi
+        echo "✅ No merge conflicts"
+    - name: Install GitHub CLI
+      run: sudo apt-get install gh -y
+    - name: Commit and push merge (optional PR instead)
+      if: ${{ success() }}
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        # 🟢 Option 1: Direkt pushen (Standard)
+        #git push origin main
+
+        # 🟡 Option 2: PR statt direktem Merge (kommentieren, falls gewünscht)
+        BRANCH="upstream-merge-$(date +%s)"
+        git checkout -b $BRANCH
+        git push origin $BRANCH
+        gh pr create --title "Merge from upstream" --body "Automatisch erstellter PR" --base main --head $BRANCH
+    
+    - name: Trigger BuildLinux workflow
+      if: false && ${{ success() }}
+      uses: benc-uk/workflow-dispatch@v1
+      with:
+        workflow: BuildLinux.yml
+        ref: main
+        token: ${{ secrets.GITHUB_TOKEN }}
+