From a8dc917732d7638a9fade07abe0027c1f31a81cf Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Mon, 4 Oct 2021 20:44:44 +0200
Subject: [PATCH 01/42] refactor:build:Introduce github actions builds

This is relevant as currenly RPs from Users are not build on CircleCI which is quite useless to have PRs not beeing able to be tested reliably
---
 .github/workflows/build.yml | 221 ++++++++++++++++++++++++++++++++++++
 fastlane/Fastfile           |   9 +-
 2 files changed, 229 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/build.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000000..6d230b028e
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,221 @@
+
+name: Build Navit Binarys
+
+on: [push, pull_request]
+
+jobs:
+  sanity_check:
+    runs-on: ubuntu-latest
+    container:
+        image: navit/sanity_check:latest
+    steps:
+        - uses: actions/checkout@v2
+        - name: run sanity check script
+          run: bash scripts/ci_sanity_checks.sh
+        - name: Run CheckStyle Test
+          run: ./gradlew checkstyleMain
+        - uses: actions/upload-artifact@v1
+          with:
+            name: Store checkstyle report
+            path: navit/android/checkstyle
+  build_linux:
+    runs-on: ubuntu-latest
+    needs: sanity_check
+    container:
+      image: debian:latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: |
+          apt-get update && apt-get install -y git
+      - name: Setup requirements
+        run: |
+           bash scripts/setup_common_requirements.sh
+           apt-get install -y libpng-dev libfreetype6-dev libdbus-glib-1-dev libgtk2.0-dev curl
+      - name: Build for Linux
+        run: bash scripts/build_linux.sh
+      - uses: actions/upload-artifact@v2
+        with:
+           name: Linux Artifacts
+           path: linux/_CPack_Packages
+      - name: Update Navit-Download-Center
+        run: |
+            bash scripts/update_download_center.sh
+  run_doxygen:
+    runs-on: ubuntu-latest
+    needs: [build_android, build_wince, build_tomtom_minimal, build_linux, build_tomtom_plugin, build_win32]
+    container:
+      image: debian:latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install doxygen and other essentials
+        run: apt-get update && apt-get -y install doxygen ca-certificates git rsync
+      - name: Run doxygen
+        run: cd navit && doxygen
+      - name: Update results to Github
+        run: bash scripts/update_doxygen.sh
+      - uses: actions/upload-artifact@v1
+        with:
+          path: /root/project/doc
+  build_sailfish:
+    runs-on: ubuntu-latest
+    needs: sanity_check
+    container:
+        image: hoehnp/sailfishos-platform-sdk:3.1.0.12
+        options: "--user root"
+    steps:
+      - uses: actions/checkout@v2
+      # TODO currently broken because of USER in Dockerimage and probably because of double containers as well
+      #- name: run build
+      #  run: contrib/sailfish/build_sailfish_ci.sh
+      #  env:
+      #      VERSION_ID: 3.1.0.12
+      #- uses: actions/upload-artifact@v1
+      #  with:
+      #    name: Store rpm
+      #    path: rpmbuild/RPMS/
+  build_android:
+    runs-on: ubuntu-latest
+    needs: sanity_check
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install requirements
+        run: scripts/setup_android.sh
+      - name: Setup Keystore and Playstore Keys
+        run: scripts/setup_publish_keys.sh
+      - uses: nttld/setup-ndk@v1
+          id: setup-ndk
+          with:
+            ndk-version: r21e
+            add-to-path: false
+      - name: Build and upload Android
+        run: fastlane github_actions
+      - name: Run Lint Test
+        run: |
+            ln -sf navit/navit.dtd navit.dtd
+            mkdir test-results
+            ./gradlew lint test
+      - name: Run Javadoc
+        run: ./gradlew generateDebugJavadoc
+      - uses: actions/upload-artifact@v1
+        with:
+          name: Store APK
+          path: navit/android/build/outputs/apk
+      - uses: actions/upload-artifact@v1
+        with:
+          name: Store logs
+          path: navit/android/build/outputs/logs
+      - uses: actions/upload-artifact@v1
+        with:
+          name: Store Javadoc
+          path: navit/android/build/outputs/docs/javadoc
+      - uses: actions/upload-artifact@v1
+        with:
+          name: Store Lint reports
+          path: navit/android/build/reports
+      - uses: actions/upload-artifact@v1
+        with:
+          name: Android Test-results
+          path: test-results
+      - name: Update Navit-Download-Center
+        run: |
+            bash scripts/update_download_center.sh
+  build_win32:
+    runs-on: ubuntu-latest
+    needs: sanity_check
+    container:
+        image: ubuntu:16.04
+    steps:
+      - uses: actions/checkout@v2
+      - run: |
+          apt-get update && apt-get install -y git
+      - name: Prepare the Windows build environment
+        run: |
+            apt-get update && xargs -a scripts/setup_14.04_requirements.list apt-get install -y
+            apt-get install -y software-properties-common
+            add-apt-repository -y ppa:george-edison55/cmake-3.x
+            apt-get install -y cmake mingw-w64 mingw-w64-tools default-jdk nsis libsaxonb-java curl
+      - name: Build for Windows
+        run: |
+            bash scripts/build_win32.sh
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Win32
+          path: win32/navit.exe
+      - name: Update Navit-Download-Center
+        run: |
+            bash scripts/update_download_center.sh
+  build_wince:
+    runs-on: ubuntu-latest
+    needs: sanity_check
+    container:
+        image: navit/dockerfiles:wince
+    steps:
+      - uses: actions/checkout@v2
+      - run: |
+          apt-get update && apt-get install -y git-core
+      - name: Prepare the WinCE build environment
+        run: |
+            bash scripts/setup_wince.sh
+      - name: Build for Windows CE
+        run: bash scripts/build_wince.sh
+      - uses: actions/upload-artifact@v1
+        with:
+          path: wince/output
+      - name: Update Navit-Download-Center
+        run: |
+            bash scripts/update_download_center.sh
+  build_tomtom_minimal:
+    runs-on: ubuntu-latest
+    needs: sanity_check
+    container:
+        image: navit/tomtom-ng
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare the tomtom build environment
+        run: |
+            bash scripts/setup_common_requirements.sh
+            apt-get install -y xsltproc
+      - name: Build for Tomtom (minimal)
+        run: bash scripts/build_tomtom_minimal.sh
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Tomtom Minimal
+          path: /output
+      - name: Update Navit-Download-Center
+        run: |
+            bash scripts/update_download_center.sh
+  build_tomtom_plugin:
+    runs-on: ubuntu-latest
+    needs: sanity_check
+    container:
+        image: navit/tomtom-ng
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare the tomtom build environment
+        run: |
+            bash scripts/setup_common_requirements.sh
+            apt-get install -y xsltproc
+      - name: Build for Tomtom (plugin)
+        run: |
+            bash scripts/build_tomtom_plugin.sh
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Tomtom Plugin
+          path: /output
+      - name: Update Navit-Download-Center
+        run: |
+            bash scripts/update_download_center.sh
+  merge_trunk_in_master:
+    runs-on: ubuntu-latest
+    needs: [build_android, build_wince, build_tomtom_minimal, build_linux, build_tomtom_plugin, build_win32]
+    if: github.ref == 'trunk'
+    steps:
+      - uses: actions/checkout@master
+      - name: Merge to master branch
+        uses: devmasx/merge-branch@v1.1.0
+        with:
+          type: now
+          target_branch: 'master'
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+  
\ No newline at end of file
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index fd4044762e..b91de985f5 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -25,8 +25,13 @@ end
 
 platform :android do
   desc "Description of what the lane does"
+  lane :github_actions do
+    # Here we can add other things that Github Actions should do
+    build
+  end
   lane :circleci do
-    # Here we can add other things that circleci should do
+    # Here we can add other things that CircleCI should do
+    build
     playstore
   end
   lane :playstore do
@@ -36,6 +41,8 @@ platform :android do
       task: 'assemble',
       build_type: 'Release'
     )
+  end
+  lane :build do
     isOnMasterBranch = currentBranch() == "master"
     isOnMasterBranch = false # Workarount do not push to google as its curently broken
     if isOnMasterBranch

From 7799109adab28f9e5ca3a2c364a9549b6d4bcc8a Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Mon, 4 Oct 2021 20:45:56 +0200
Subject: [PATCH 02/42] Fix:build:Fixed indent

---
 .github/workflows/build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6d230b028e..333e4e0d87 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -83,10 +83,10 @@ jobs:
       - name: Setup Keystore and Playstore Keys
         run: scripts/setup_publish_keys.sh
       - uses: nttld/setup-ndk@v1
-          id: setup-ndk
-          with:
-            ndk-version: r21e
-            add-to-path: false
+        id: setup-ndk
+        with:
+          ndk-version: r21e
+          add-to-path: false
       - name: Build and upload Android
         run: fastlane github_actions
       - name: Run Lint Test

From 7981c0cdadba709db53e8d80ee4d254176ffd4d6 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Mon, 4 Oct 2021 20:51:23 +0200
Subject: [PATCH 03/42] Add:build:Add Rviewdog to have automatic Formating
 suggestions

---
 .github/workflows/build.yml | 7 +++++++
 scripts/ci_sanity_checks.sh | 4 +---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 333e4e0d87..02a97dd326 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,12 +12,19 @@ jobs:
         - uses: actions/checkout@v2
         - name: run sanity check script
           run: bash scripts/ci_sanity_checks.sh
+        - uses: reviewdog/action-suggester@v1
+          with:
+            github_token: ${{ secrets.github_token }}
+            tool_name: Navit sanity Check
+            level: error
+            fail_on_error: true
         - name: Run CheckStyle Test
           run: ./gradlew checkstyleMain
         - uses: actions/upload-artifact@v1
           with:
             name: Store checkstyle report
             path: navit/android/checkstyle
+
   build_linux:
     runs-on: ubuntu-latest
     needs: sanity_check
diff --git a/scripts/ci_sanity_checks.sh b/scripts/ci_sanity_checks.sh
index de46d5f150..13b3cc5da4 100755
--- a/scripts/ci_sanity_checks.sh
+++ b/scripts/ci_sanity_checks.sh
@@ -56,6 +56,4 @@ for f in $(git diff --name-only refs/remotes/origin/trunk | sort -u); do
             fi
         fi
     fi
-done
-
-exit $return_code
+done
\ No newline at end of file

From f678941b045c7cd8e7345e5180e6f2799aa49390 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Mon, 4 Oct 2021 21:00:23 +0200
Subject: [PATCH 04/42] Fix: Fetch all Braches to be able to compare to trunk

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 02a97dd326..15cee6a892 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,6 +10,8 @@ jobs:
         image: navit/sanity_check:latest
     steps:
         - uses: actions/checkout@v2
+          with:
+            fetch-depth: 0
         - name: run sanity check script
           run: bash scripts/ci_sanity_checks.sh
         - uses: reviewdog/action-suggester@v1

From 2aba1cffd6020d78908728822be9d25bd3bec832 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Mon, 4 Oct 2021 21:03:30 +0200
Subject: [PATCH 05/42] Change:build:remove reset

---
 scripts/ci_sanity_checks.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/ci_sanity_checks.sh b/scripts/ci_sanity_checks.sh
index 13b3cc5da4..e5d1782f04 100755
--- a/scripts/ci_sanity_checks.sh
+++ b/scripts/ci_sanity_checks.sh
@@ -19,7 +19,6 @@ check_diff(){
     if [[ $code -ne 0 ]]; then
         echo "[ERROR] You may need to do some cleanup in the files you commited, see the git diff output above."
     fi
-    git checkout -- .
     return_code=$(($return_code + $code))
 }
 

From 2dc3174c4ebb38c82b2559147cb75ccb186edeab Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Mon, 4 Oct 2021 21:16:32 +0200
Subject: [PATCH 06/42] fix:Sanity_check:Update .github/workflows/build.yml

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/workflows/build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 15cee6a892..74f86ca7a7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -226,5 +226,4 @@ jobs:
           type: now
           target_branch: 'master'
         env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-  
\ No newline at end of file
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
\ No newline at end of file

From 1d976f7bec1666ed411d1595ad636aff59a33871 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Mon, 4 Oct 2021 21:20:19 +0200
Subject: [PATCH 07/42] change:build:deactivated as somethings broken with
 gradlew checkstyle

---
 .github/workflows/build.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 74f86ca7a7..bfd67be202 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,8 +20,9 @@ jobs:
             tool_name: Navit sanity Check
             level: error
             fail_on_error: true
-        - name: Run CheckStyle Test
-          run: ./gradlew checkstyleMain
+        # FIXME: deactivated as somethings broken with it
+        #- name: Run CheckStyle Test
+        #  run: ./gradlew checkstyleMain
         - uses: actions/upload-artifact@v1
           with:
             name: Store checkstyle report
@@ -226,4 +227,5 @@ jobs:
           type: now
           target_branch: 'master'
         env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
\ No newline at end of file
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+  
\ No newline at end of file

From b8803a08488471192df1c7aa0257afa0e4038a35 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Mon, 4 Oct 2021 21:24:22 +0200
Subject: [PATCH 08/42] fix

---
 .github/workflows/build.yml | 3 +--
 scripts/ci_sanity_checks.sh | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bfd67be202..a200718418 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -227,5 +227,4 @@ jobs:
           type: now
           target_branch: 'master'
         env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-  
\ No newline at end of file
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
\ No newline at end of file
diff --git a/scripts/ci_sanity_checks.sh b/scripts/ci_sanity_checks.sh
index e5d1782f04..7e08feedb7 100755
--- a/scripts/ci_sanity_checks.sh
+++ b/scripts/ci_sanity_checks.sh
@@ -55,4 +55,5 @@ for f in $(git diff --name-only refs/remotes/origin/trunk | sort -u); do
             fi
         fi
     fi
-done
\ No newline at end of file
+done
+git diff
\ No newline at end of file

From 29ff9ab81d8dca7cfd18df8d7003310b805b3910 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Mon, 4 Oct 2021 21:27:15 +0200
Subject: [PATCH 09/42] Deactivate upload as well, as CheckStyle is not yet
 running

---
 .github/workflows/build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a200718418..bdb748a2fb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,10 +23,10 @@ jobs:
         # FIXME: deactivated as somethings broken with it
         #- name: Run CheckStyle Test
         #  run: ./gradlew checkstyleMain
-        - uses: actions/upload-artifact@v1
-          with:
-            name: Store checkstyle report
-            path: navit/android/checkstyle
+        #- uses: actions/upload-artifact@v1
+        #  with:
+        #    name: Store checkstyle report
+        #    path: navit/android/checkstyle
 
   build_linux:
     runs-on: ubuntu-latest

From d8d46c50d8b1ecab0b7ff17bc4acfead538eeb82 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Mon, 4 Oct 2021 21:33:48 +0200
Subject: [PATCH 10/42] add sudo

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bdb748a2fb..5a87496c78 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -89,7 +89,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Install requirements
-        run: scripts/setup_android.sh
+        run: sudo bash scripts/setup_android.sh
       - name: Setup Keystore and Playstore Keys
         run: scripts/setup_publish_keys.sh
       - uses: nttld/setup-ndk@v1

From db42177e46134f543872a8f2765559a306ec6c32 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Tue, 5 Oct 2021 06:07:21 +0200
Subject: [PATCH 11/42] fixed:build:Added skd and add ndk to path. Also install
 java

---
 .github/workflows/build.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5a87496c78..7a903f3e74 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -92,11 +92,16 @@ jobs:
         run: sudo bash scripts/setup_android.sh
       - name: Setup Keystore and Playstore Keys
         run: scripts/setup_publish_keys.sh
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
       - uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
           ndk-version: r21e
-          add-to-path: false
       - name: Build and upload Android
         run: fastlane github_actions
       - name: Run Lint Test

From aabb93725e34b32e3c8f4b4ceeade71ee8402800 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Tue, 5 Oct 2021 06:20:16 +0200
Subject: [PATCH 12/42] try to get history as well

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7a903f3e74..209fcf1c9d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -88,6 +88,8 @@ jobs:
     needs: sanity_check
     steps:
       - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
       - name: Install requirements
         run: sudo bash scripts/setup_android.sh
       - name: Setup Keystore and Playstore Keys

From 5738d09571763a67559649a16dce42bd10919a08 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Tue, 5 Oct 2021 06:21:20 +0200
Subject: [PATCH 13/42] fix syntax

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 209fcf1c9d..f17fb6f0ba 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -88,8 +88,8 @@ jobs:
     needs: sanity_check
     steps:
       - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
+        with:
+          fetch-depth: 0
       - name: Install requirements
         run: sudo bash scripts/setup_android.sh
       - name: Setup Keystore and Playstore Keys

From 73257e43de2925ff68884693a5e91e2be5a61f8c Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Tue, 5 Oct 2021 06:29:03 +0200
Subject: [PATCH 14/42] mixed lane names

---
 fastlane/Fastfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index b91de985f5..08dac331d8 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -34,7 +34,7 @@ platform :android do
     build
     playstore
   end
-  lane :playstore do
+  lane :build do
     sh("cd ..;bash scripts/build_android.sh")
 
     gradle(
@@ -42,7 +42,7 @@ platform :android do
       build_type: 'Release'
     )
   end
-  lane :build do
+  lane :playstore do
     isOnMasterBranch = currentBranch() == "master"
     isOnMasterBranch = false # Workarount do not push to google as its curently broken
     if isOnMasterBranch

From d9e0f23e212eb8caf1f2695b0a79bc3372216233 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Tue, 5 Oct 2021 07:45:03 +0200
Subject: [PATCH 15/42] try to add ndkVersion to automatically get ndk

---
 .github/workflows/build.yml | 4 ----
 build.gradle                | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f17fb6f0ba..aea12bdd16 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -100,10 +100,6 @@ jobs:
           java-version: 1.8
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
-      - uses: nttld/setup-ndk@v1
-        id: setup-ndk
-        with:
-          ndk-version: r21e
       - name: Build and upload Android
         run: fastlane github_actions
       - name: Run Lint Test
diff --git a/build.gradle b/build.gradle
index d284d54a06..08b3e5e78c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,6 +38,7 @@ task clean(type: Delete) {
 android {
     compileSdkVersion 29
     buildToolsVersion "29.0.2"
+    ndkVersion "23.0.7599858"
     signingConfigs {
         release {
             // We can leave these in environment variables

From feb29b7b028a3da8eacef075977dfcd869c87e1a Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Tue, 5 Oct 2021 13:11:09 +0200
Subject: [PATCH 16/42] Update Gradle

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 08b3e5e78c..a0fb4716cd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

From f62bb96cdbbc4454ed624488d0d04df236e22064 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Tue, 5 Oct 2021 13:18:06 +0200
Subject: [PATCH 17/42] update wrapper

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7292aa85e7..ddf7fd9b21 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
-distributionSha256Sum=33214524e686838c88a88e14e8b30e2323589cc9698186bc8e0594758b132b31
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionSha256Sum=22449f5231796abd892c98b2a07c9ceebe4688d192cd2d6763f8e3bf8acbedeb

From 6f6ec6a2d5e44d61f8268ee9b0e4fafbb77ceb51 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Wed, 6 Oct 2021 11:12:20 +0200
Subject: [PATCH 18/42] Try to fix Lint error with getColumnIndexOrThrow
 instead of getColumnIndex

---
 navit/android/src/org/navitproject/navit/NavitTraff.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/navit/android/src/org/navitproject/navit/NavitTraff.java b/navit/android/src/org/navitproject/navit/NavitTraff.java
index fd499b70b5..75d19841c3 100644
--- a/navit/android/src/org/navitproject/navit/NavitTraff.java
+++ b/navit/android/src/org/navitproject/navit/NavitTraff.java
@@ -357,7 +357,7 @@ private void fetchMessages(Context context, Uri uri) {
             }
             StringBuilder builder = new StringBuilder("<feed>\n");
             while (cursor.moveToNext())
-                builder.append(cursor.getString(cursor.getColumnIndex(COLUMN_DATA))).append("\n");
+                builder.append(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_DATA))).append("\n");
             builder.append("</feed>");
             cursor.close();
             onFeedReceived(mCbid, builder.toString());

From 326b015eae5f9cfb8cdbb6a18279b824718b1586 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@gmx.de>
Date: Mon, 23 May 2022 16:22:58 +0200
Subject: [PATCH 19/42] change:build:reenable sailfishos as its working with
 act now

---
 .github/workflows/build.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aea12bdd16..913e83597c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,18 +71,17 @@ jobs:
     needs: sanity_check
     container:
         image: hoehnp/sailfishos-platform-sdk:3.1.0.12
-        options: "--user root"
     steps:
       - uses: actions/checkout@v2
       # TODO currently broken because of USER in Dockerimage and probably because of double containers as well
-      #- name: run build
-      #  run: contrib/sailfish/build_sailfish_ci.sh
-      #  env:
-      #      VERSION_ID: 3.1.0.12
-      #- uses: actions/upload-artifact@v1
-      #  with:
-      #    name: Store rpm
-      #    path: rpmbuild/RPMS/
+      - name: run build
+        run: contrib/sailfish/build_sailfish_ci.sh
+        env:
+            VERSION_ID: 3.1.0.12
+      - uses: actions/upload-artifact@v1
+        with:
+          name: Store rpm
+          path: rpmbuild/RPMS/
   build_android:
     runs-on: ubuntu-latest
     needs: sanity_check
@@ -230,4 +229,4 @@ jobs:
           type: now
           target_branch: 'master'
         env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
\ No newline at end of file
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

From 6e3bb021a37b4b6d0d8c2064fc72dce604cc98cf Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Tue, 7 Jun 2022 11:53:31 +0200
Subject: [PATCH 20/42] Add:build:android:Add ndk install

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 913e83597c..1951168496 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -99,6 +99,8 @@ jobs:
           java-version: 1.8
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
+      - name: Install NDK
+        run: sdkmanager "ndk;22.0.7026061"
       - name: Build and upload Android
         run: fastlane github_actions
       - name: Run Lint Test

From 4b14091f8edf56bb0b4b240ff9e683f441060337 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@gmx.de>
Date: Sun, 12 Jun 2022 12:40:48 +0200
Subject: [PATCH 21/42] fix:build:android:Make build compatible with act
 (https://github.com/nektos/act/) to test localy

---
 .github/workflows/build.yml | 25 +++++++++++--------------
 scripts/setup_android.sh    |  3 ++-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1951168496..0636201a22 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,14 +12,14 @@ jobs:
         - uses: actions/checkout@v2
           with:
             fetch-depth: 0
-        - name: run sanity check script
-          run: bash scripts/ci_sanity_checks.sh
-        - uses: reviewdog/action-suggester@v1
-          with:
-            github_token: ${{ secrets.github_token }}
-            tool_name: Navit sanity Check
-            level: error
-            fail_on_error: true
+        ##- name: run sanity check script
+        ##  run: bash scripts/ci_sanity_checks.sh
+        ##- uses: reviewdog/action-suggester@v1
+        ##  with:
+        ##    github_token: ${{ secrets.github_token }}
+        ##    tool_name: Navit sanity Check
+        ##    level: error
+        ##    fail_on_error: false
         # FIXME: deactivated as somethings broken with it
         #- name: Run CheckStyle Test
         #  run: ./gradlew checkstyleMain
@@ -89,18 +89,15 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
+      - run: apt update && apt install -y sudo
       - name: Install requirements
-        run: sudo bash scripts/setup_android.sh
+        run: bash scripts/setup_android.sh
       - name: Setup Keystore and Playstore Keys
         run: scripts/setup_publish_keys.sh
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
       - name: Install NDK
-        run: sdkmanager "ndk;22.0.7026061"
+        run: sdkmanager "ndk;23.0.7599858"
       - name: Build and upload Android
         run: fastlane github_actions
       - name: Run Lint Test
diff --git a/scripts/setup_android.sh b/scripts/setup_android.sh
index 357cdc9904..ed5d0d88b4 100755
--- a/scripts/setup_android.sh
+++ b/scripts/setup_android.sh
@@ -2,6 +2,7 @@
 set -e
 
 sudo apt-get update
-sudo apt-get install -y cmake gettext libsaxonb-java librsvg2-bin pkg-config rename
+sudo apt-get install -y cmake gettext libsaxonb-java librsvg2-bin pkg-config rename ruby ruby-dev build-essential rake-compiler git default-jdk-headless
+gem install rake
 gem install --no-document fastlane git
 

From 972566b9c8743c41cc0db5badff55bfc8efd3595 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@gmx.de>
Date: Sun, 12 Jun 2022 12:41:53 +0200
Subject: [PATCH 22/42] fix:build:android:Fix setup and build of/with ndk

---
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index a0fb4716cd..08459f6ff2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ddf7fd9b21..bcc1aa9039 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
-distributionSha256Sum=22449f5231796abd892c98b2a07c9ceebe4688d192cd2d6763f8e3bf8acbedeb
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionSha256Sum=a8da5b02437a60819cad23e10fc7e9cf32bcb57029d9cb277e26eeff76ce014b

From 7873e834a9fd13f7bce1c5f4ec3c2a37d948e35b Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@gmx.de>
Date: Sun, 12 Jun 2022 13:03:44 +0200
Subject: [PATCH 23/42] fix:build:android:install sudo only if UID is 0 as act
 is slightly different

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0636201a22..33ac792f15 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -89,7 +89,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - run: apt update && apt install -y sudo
+      - run: if [ "X$UID" == X0 ]; then apt update && apt install -y sudo; fi
       - name: Install requirements
         run: bash scripts/setup_android.sh
       - name: Setup Keystore and Playstore Keys

From 9cded32d83a7d1ed9336e6fda69a5563610d5f82 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@gmx.de>
Date: Sun, 12 Jun 2022 13:06:55 +0200
Subject: [PATCH 24/42] fix:build:android:run gem install with as root

---
 scripts/setup_android.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/setup_android.sh b/scripts/setup_android.sh
index ed5d0d88b4..98d1747a54 100755
--- a/scripts/setup_android.sh
+++ b/scripts/setup_android.sh
@@ -3,6 +3,6 @@ set -e
 
 sudo apt-get update
 sudo apt-get install -y cmake gettext libsaxonb-java librsvg2-bin pkg-config rename ruby ruby-dev build-essential rake-compiler git default-jdk-headless
-gem install rake
-gem install --no-document fastlane git
+sudo gem install rake
+sudo gem install --no-document fastlane git
 

From 6d24a1f609d09d9a54c35802f685aab670f85e81 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@gmx.de>
Date: Sun, 12 Jun 2022 14:47:22 +0200
Subject: [PATCH 25/42] fix:build:android:Fix upload paths

---
 .github/workflows/build.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 33ac792f15..3fec139a4e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -107,23 +107,24 @@ jobs:
             ./gradlew lint test
       - name: Run Javadoc
         run: ./gradlew generateDebugJavadoc
-      - uses: actions/upload-artifact@v1
+      - run: find / -name apk
+      - uses: actions/upload-artifact@v3
         with:
           name: Store APK
-          path: navit/android/build/outputs/apk
-      - uses: actions/upload-artifact@v1
+          path: build/outputs/apk
+      - uses: actions/upload-artifact@v3
         with:
           name: Store logs
-          path: navit/android/build/outputs/logs
-      - uses: actions/upload-artifact@v1
+          path: build/outputs/logs
+      - uses: actions/upload-artifact@v3
         with:
           name: Store Javadoc
-          path: navit/android/build/outputs/docs/javadoc
-      - uses: actions/upload-artifact@v1
+          path: build/outputs/docs/javadoc
+      - uses: actions/upload-artifact@v3
         with:
           name: Store Lint reports
-          path: navit/android/build/reports
-      - uses: actions/upload-artifact@v1
+          path: build/reports
+      - uses: actions/upload-artifact@v3
         with:
           name: Android Test-results
           path: test-results

From 680e3d4157a28818b401f461e5495ec5c914f905 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@gmx.de>
Date: Sun, 12 Jun 2022 15:04:28 +0200
Subject: [PATCH 26/42] fix:build:android:Remove debug code

---
 .github/workflows/build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3fec139a4e..e2a51b8ae1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -107,7 +107,6 @@ jobs:
             ./gradlew lint test
       - name: Run Javadoc
         run: ./gradlew generateDebugJavadoc
-      - run: find / -name apk
       - uses: actions/upload-artifact@v3
         with:
           name: Store APK

From 4fff98302d1a46bef6ed7eec9ddfd7d77c2ff35a Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@gmx.de>
Date: Sun, 12 Jun 2022 15:44:49 +0200
Subject: [PATCH 27/42] debug

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e2a51b8ae1..08d790a576 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -161,7 +161,7 @@ jobs:
     container:
         image: navit/dockerfiles:wince
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v1
       - run: |
           apt-get update && apt-get install -y git-core
       - name: Prepare the WinCE build environment

From 3ca3e2686e736b588214460d19a1066fd6a3716b Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@gmx.de>
Date: Sun, 12 Jun 2022 15:46:32 +0200
Subject: [PATCH 28/42] debug

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 08d790a576..70bdb234dd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -161,7 +161,7 @@ jobs:
     container:
         image: navit/dockerfiles:wince
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - run: |
           apt-get update && apt-get install -y git-core
       - name: Prepare the WinCE build environment

From cb67a119992b7172884524315b3ce74deb5c4954 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@gmx.de>
Date: Sun, 12 Jun 2022 15:51:10 +0200
Subject: [PATCH 29/42] Revert "debug"

This reverts commit 65268d11a142a86f8d8a6c047064f384889d2a47.
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 70bdb234dd..08d790a576 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -161,7 +161,7 @@ jobs:
     container:
         image: navit/dockerfiles:wince
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v1
       - run: |
           apt-get update && apt-get install -y git-core
       - name: Prepare the WinCE build environment

From 818e97e13353d3fc90e847672bd3a8e91c67fbb8 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@gmx.de>
Date: Sun, 12 Jun 2022 15:52:19 +0200
Subject: [PATCH 30/42] fix:build:Fix checkout on wince and sailfish

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 08d790a576..269e611db4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -72,7 +72,7 @@ jobs:
     container:
         image: hoehnp/sailfishos-platform-sdk:3.1.0.12
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v1
       # TODO currently broken because of USER in Dockerimage and probably because of double containers as well
       - name: run build
         run: contrib/sailfish/build_sailfish_ci.sh

From c822c8d0420d68f5db050da5c00002b4c70eedfc Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@gmx.de>
Date: Sun, 12 Jun 2022 15:58:55 +0200
Subject: [PATCH 31/42] fix:build:Add name of artifact to be able to upload

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 269e611db4..59a7cf5904 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -172,6 +172,7 @@ jobs:
       - uses: actions/upload-artifact@v1
         with:
           path: wince/output
+          name: WinCE Binary
       - name: Update Navit-Download-Center
         run: |
             bash scripts/update_download_center.sh

From a9d0495fdd82a598821594af19a0f056ff01cc58 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@gmx.de>
Date: Sun, 12 Jun 2022 20:18:13 +0200
Subject: [PATCH 32/42] fix:build:sailfish:Repeat image change from #1183

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 59a7cf5904..2620b1098e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -70,14 +70,14 @@ jobs:
     runs-on: ubuntu-latest
     needs: sanity_check
     container:
-        image: hoehnp/sailfishos-platform-sdk:3.1.0.12
+        image: coderus/sailfishos-platform-sdk:3.4.0.24
     steps:
       - uses: actions/checkout@v1
       # TODO currently broken because of USER in Dockerimage and probably because of double containers as well
       - name: run build
         run: contrib/sailfish/build_sailfish_ci.sh
         env:
-            VERSION_ID: 3.1.0.12
+            VERSION_ID: 3.4.0.24
       - uses: actions/upload-artifact@v1
         with:
           name: Store rpm

From fd1fe9ffe0b942e582fbb72833c64b223b170461 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Tue, 14 Jun 2022 07:16:58 +0200
Subject: [PATCH 33/42] Fix:build:sailfish:Run with bash

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2620b1098e..5a2d70abfe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,7 +75,7 @@ jobs:
       - uses: actions/checkout@v1
       # TODO currently broken because of USER in Dockerimage and probably because of double containers as well
       - name: run build
-        run: contrib/sailfish/build_sailfish_ci.sh
+        run: bash contrib/sailfish/build_sailfish_ci.sh
         env:
             VERSION_ID: 3.4.0.24
       - uses: actions/upload-artifact@v1

From f8b121872fe667ac21377e63e2b143e8c6571434 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Tue, 14 Jun 2022 07:17:38 +0200
Subject: [PATCH 34/42] Fix:build:sailfish:Remove ls of non existing dir

---
 contrib/sailfish/build_sailfish_ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/sailfish/build_sailfish_ci.sh b/contrib/sailfish/build_sailfish_ci.sh
index 9b5849f9ff..eccf89abdb 100755
--- a/contrib/sailfish/build_sailfish_ci.sh
+++ b/contrib/sailfish/build_sailfish_ci.sh
@@ -10,7 +10,7 @@ if [ -z ${VERSION_ID+x} ]; then echo "VERSION_ID not set. Forgot to export VERSI
 # Makes calling it directly from docker easier.
 SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
 cd $SCRIPTPATH
-ls -lah /navit
+
 mkdir $HOME/rpmbuild
 
 #arm devices

From c6e10d2ca6705a0d08b4d3034472d15ddd0b2047 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Tue, 14 Jun 2022 07:39:03 +0200
Subject: [PATCH 35/42] try run with sudo...

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5a2d70abfe..b90372c3c1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,7 +75,7 @@ jobs:
       - uses: actions/checkout@v1
       # TODO currently broken because of USER in Dockerimage and probably because of double containers as well
       - name: run build
-        run: bash contrib/sailfish/build_sailfish_ci.sh
+        run: sudo bash contrib/sailfish/build_sailfish_ci.sh
         env:
             VERSION_ID: 3.4.0.24
       - uses: actions/upload-artifact@v1

From 185af7d0390cd5201208fe3c47fb12e7d4f52ee2 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Tue, 14 Jun 2022 07:43:20 +0200
Subject: [PATCH 36/42] try keeping env

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b90372c3c1..af362ee5bc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,7 +75,7 @@ jobs:
       - uses: actions/checkout@v1
       # TODO currently broken because of USER in Dockerimage and probably because of double containers as well
       - name: run build
-        run: sudo bash contrib/sailfish/build_sailfish_ci.sh
+        run: sudo -E bash contrib/sailfish/build_sailfish_ci.sh
         env:
             VERSION_ID: 3.4.0.24
       - uses: actions/upload-artifact@v1

From ecd140d5f99fcd4c82e5cfba8aee1f9ed1f0fc68 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Tue, 14 Jun 2022 07:47:43 +0200
Subject: [PATCH 37/42] try bash with -x to better debug whats going on... on
 act its working

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index af362ee5bc..b0f16acdc0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -76,6 +76,7 @@ jobs:
       # TODO currently broken because of USER in Dockerimage and probably because of double containers as well
       - name: run build
         run: sudo -E bash contrib/sailfish/build_sailfish_ci.sh
+        shell: bash -x
         env:
             VERSION_ID: 3.4.0.24
       - uses: actions/upload-artifact@v1

From 09fc06e856c809bcd9673be04aea9ce0a8e22a70 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Tue, 14 Jun 2022 08:03:51 +0200
Subject: [PATCH 38/42] next try

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b0f16acdc0..3c157a9900 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,8 +75,8 @@ jobs:
       - uses: actions/checkout@v1
       # TODO currently broken because of USER in Dockerimage and probably because of double containers as well
       - name: run build
-        run: sudo -E bash contrib/sailfish/build_sailfish_ci.sh
-        shell: bash -x
+        run: sudo -E bash -x contrib/sailfish/build_sailfish_ci.sh
+        shell: bash
         env:
             VERSION_ID: 3.4.0.24
       - uses: actions/upload-artifact@v1

From b3bdcb9954982377870cc68dfd78812f1d177335 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Tue, 14 Jun 2022 08:12:49 +0200
Subject: [PATCH 39/42] fix:build:sailfish:Fix Target config

---
 .github/workflows/build.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3c157a9900..5616269fc7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -74,9 +74,10 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       # TODO currently broken because of USER in Dockerimage and probably because of double containers as well
+      - name: Fix Scratchbox setup
+        run: sudo cp -ar /home/nemo/.scratchbox2/ ~/
       - name: run build
-        run: sudo -E bash -x contrib/sailfish/build_sailfish_ci.sh
-        shell: bash
+        run: sudo -E bash contrib/sailfish/build_sailfish_ci.sh
         env:
             VERSION_ID: 3.4.0.24
       - uses: actions/upload-artifact@v1

From 23356aee4665753a25dabc426a61845dc769a3d4 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Tue, 14 Jun 2022 13:14:40 +0200
Subject: [PATCH 40/42] try change home

---
 contrib/sailfish/build_sailfish_ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/sailfish/build_sailfish_ci.sh b/contrib/sailfish/build_sailfish_ci.sh
index eccf89abdb..fee98d82aa 100755
--- a/contrib/sailfish/build_sailfish_ci.sh
+++ b/contrib/sailfish/build_sailfish_ci.sh
@@ -3,7 +3,7 @@
 # please don't mess around with those lines without testing,
 # even if some fancy tool tells you to do so to save some pipes.
 # -hoehnp-
-
+export HOME=/home/nemo
 if [ -z ${VERSION_ID+x} ]; then echo "VERSION_ID not set. Forgot to export VERSION_ID?"; exit 1; fi
 
 # First we need to cd to the directory containing this script and the spec file.

From 74186ebccbd6ac1495cbb83c63d1316750b16fad Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Tue, 14 Jun 2022 13:22:06 +0200
Subject: [PATCH 41/42] try 4.4.0.64

---
 .github/workflows/build.yml           | 4 ++--
 contrib/sailfish/build_sailfish_ci.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5616269fc7..a8908772bf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -70,7 +70,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: sanity_check
     container:
-        image: coderus/sailfishos-platform-sdk:3.4.0.24
+        image: coderus/sailfishos-platform-sdk:4.4.0.64
     steps:
       - uses: actions/checkout@v1
       # TODO currently broken because of USER in Dockerimage and probably because of double containers as well
@@ -79,7 +79,7 @@ jobs:
       - name: run build
         run: sudo -E bash contrib/sailfish/build_sailfish_ci.sh
         env:
-            VERSION_ID: 3.4.0.24
+            VERSION_ID: 4.4.0.64
       - uses: actions/upload-artifact@v1
         with:
           name: Store rpm
diff --git a/contrib/sailfish/build_sailfish_ci.sh b/contrib/sailfish/build_sailfish_ci.sh
index fee98d82aa..eccf89abdb 100755
--- a/contrib/sailfish/build_sailfish_ci.sh
+++ b/contrib/sailfish/build_sailfish_ci.sh
@@ -3,7 +3,7 @@
 # please don't mess around with those lines without testing,
 # even if some fancy tool tells you to do so to save some pipes.
 # -hoehnp-
-export HOME=/home/nemo
+
 if [ -z ${VERSION_ID+x} ]; then echo "VERSION_ID not set. Forgot to export VERSION_ID?"; exit 1; fi
 
 # First we need to cd to the directory containing this script and the spec file.

From f29485b4ddd152f75641b5100e9493394d5b61ec Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Tue, 14 Jun 2022 13:27:05 +0200
Subject: [PATCH 42/42] remove tmp fix

---
 .github/workflows/build.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a8908772bf..682769b976 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -74,8 +74,6 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       # TODO currently broken because of USER in Dockerimage and probably because of double containers as well
-      - name: Fix Scratchbox setup
-        run: sudo cp -ar /home/nemo/.scratchbox2/ ~/
       - name: run build
         run: sudo -E bash contrib/sailfish/build_sailfish_ci.sh
         env: