From 5517bd18a038e3e7db17bc39d57b57fa1c7b04d0 Mon Sep 17 00:00:00 2001 From: jkoan Date: Mon, 4 Oct 2021 20:44:44 +0200 Subject: [PATCH 01/49] 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 89c6996cffcf2830c68bb5f7cd8ffd47c81300c6 Mon Sep 17 00:00:00 2001 From: jkoan Date: Mon, 4 Oct 2021 20:45:56 +0200 Subject: [PATCH 02/49] 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 85cd19b640b3750943901eef1b623639288c2502 Mon Sep 17 00:00:00 2001 From: jkoan Date: Mon, 4 Oct 2021 20:51:23 +0200 Subject: [PATCH 03/49] 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 7c6bd9e79589045affbccabd2446507bc3d96562 Mon Sep 17 00:00:00 2001 From: jkoan Date: Mon, 4 Oct 2021 21:00:23 +0200 Subject: [PATCH 04/49] 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 b86577fbcf2a8e75d265024d3bf897cebc6706ca Mon Sep 17 00:00:00 2001 From: jkoan Date: Mon, 4 Oct 2021 21:03:30 +0200 Subject: [PATCH 05/49] 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 704cceb16078642712fd5ae34a0410eb3350a7b1 Mon Sep 17 00:00:00 2001 From: jkoan Date: Mon, 4 Oct 2021 21:16:32 +0200 Subject: [PATCH 06/49] 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 2935096c359d22d0e19f1b4686c3d94e04e829c9 Mon Sep 17 00:00:00 2001 From: jkoan Date: Mon, 4 Oct 2021 21:20:19 +0200 Subject: [PATCH 07/49] 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 024e42a63d9b6b6babed3e78f45103c253b881ce Mon Sep 17 00:00:00 2001 From: jkoan Date: Mon, 4 Oct 2021 21:24:22 +0200 Subject: [PATCH 08/49] 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 c69817ad67d5aa27a1b70016c3a220ea77541f6e Mon Sep 17 00:00:00 2001 From: jkoan Date: Mon, 4 Oct 2021 21:27:15 +0200 Subject: [PATCH 09/49] 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 c8e4011bebdce1bbd5e6cbf9b0fb597025dfb8c8 Mon Sep 17 00:00:00 2001 From: jkoan Date: Mon, 4 Oct 2021 21:33:48 +0200 Subject: [PATCH 10/49] 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 ebb363299a3313fd6d548cd09ec8f68afceffc6b Mon Sep 17 00:00:00 2001 From: jkoan Date: Tue, 5 Oct 2021 06:07:21 +0200 Subject: [PATCH 11/49] 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 4e782fd2163e767868ae644f50d5d4f21b6dfb7f Mon Sep 17 00:00:00 2001 From: jkoan Date: Tue, 5 Oct 2021 06:20:16 +0200 Subject: [PATCH 12/49] 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 d724fda05a3f3b7389995b828ee59df9a753e725 Mon Sep 17 00:00:00 2001 From: jkoan Date: Tue, 5 Oct 2021 06:21:20 +0200 Subject: [PATCH 13/49] 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 9cbb642a0aca25e168a47836801051a4abbaf086 Mon Sep 17 00:00:00 2001 From: jkoan Date: Tue, 5 Oct 2021 06:29:03 +0200 Subject: [PATCH 14/49] 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 f57dd0906a70243b2f8eb5e5333836e9b8809f2e Mon Sep 17 00:00:00 2001 From: jkoan Date: Tue, 5 Oct 2021 07:45:03 +0200 Subject: [PATCH 15/49] 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 1b2af275a2ec48c898a2e5783871c378f02f9c6d Mon Sep 17 00:00:00 2001 From: jkoan Date: Tue, 5 Oct 2021 13:11:09 +0200 Subject: [PATCH 16/49] 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 24d30603ed11b13cbb1aff4a263cd128a6d98e01 Mon Sep 17 00:00:00 2001 From: jkoan Date: Tue, 5 Oct 2021 13:18:06 +0200 Subject: [PATCH 17/49] 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 81e33b5a88541a2b227272150b265e792a595151 Mon Sep 17 00:00:00 2001 From: jkoan Date: Wed, 6 Oct 2021 11:12:20 +0200 Subject: [PATCH 18/49] 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("\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(""); cursor.close(); onFeedReceived(mCbid, builder.toString()); From e1d4ff86ba61c0e540f7a5fba6c8c34940e38536 Mon Sep 17 00:00:00 2001 From: jkoan Date: Mon, 23 May 2022 16:22:58 +0200 Subject: [PATCH 19/49] 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 978e3422c41c24ffcd88f69b7a485693c0fd6b24 Mon Sep 17 00:00:00 2001 From: jkoan Date: Tue, 7 Jun 2022 11:53:31 +0200 Subject: [PATCH 20/49] 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 80df7014d36161538f96f6b69f29891fbbfed940 Mon Sep 17 00:00:00 2001 From: jkoan Date: Sun, 12 Jun 2022 12:40:48 +0200 Subject: [PATCH 21/49] 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 46d0a080bd8d4a11bdcea2a29395211936e4adcc Mon Sep 17 00:00:00 2001 From: jkoan Date: Sun, 12 Jun 2022 12:41:53 +0200 Subject: [PATCH 22/49] 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 8934f8d3023f6baf5ad8d67088bfb94f63e1b1ea Mon Sep 17 00:00:00 2001 From: jkoan Date: Sun, 12 Jun 2022 13:03:44 +0200 Subject: [PATCH 23/49] 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 6827b67058d7d9d5aebff926b80443589ddfe01e Mon Sep 17 00:00:00 2001 From: jkoan Date: Sun, 12 Jun 2022 13:06:55 +0200 Subject: [PATCH 24/49] 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 b42cf11a06e7aa8927794b3b78011bb0b392d41f Mon Sep 17 00:00:00 2001 From: jkoan Date: Sun, 12 Jun 2022 14:47:22 +0200 Subject: [PATCH 25/49] 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 ca111fd5fca695b9f33fe30fdf4c5175bb794cec Mon Sep 17 00:00:00 2001 From: jkoan Date: Sun, 12 Jun 2022 15:04:28 +0200 Subject: [PATCH 26/49] 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 dc6c1c4732b85072ae895a0b9f840087a25710d5 Mon Sep 17 00:00:00 2001 From: jkoan Date: Sun, 12 Jun 2022 15:44:49 +0200 Subject: [PATCH 27/49] 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 b2708da3b649abcbc0dda11661ee61a576b61fa5 Mon Sep 17 00:00:00 2001 From: jkoan Date: Sun, 12 Jun 2022 15:46:32 +0200 Subject: [PATCH 28/49] 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 44ff8ba79e91016f8a94df55f04cfc8e2dc52f19 Mon Sep 17 00:00:00 2001 From: jkoan Date: Sun, 12 Jun 2022 15:51:10 +0200 Subject: [PATCH 29/49] 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 41024be6090902781e77a5570fd318344614dd99 Mon Sep 17 00:00:00 2001 From: jkoan Date: Sun, 12 Jun 2022 15:52:19 +0200 Subject: [PATCH 30/49] 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 584c50c6ffe4ddd403a4f1ca74f728e802d0d093 Mon Sep 17 00:00:00 2001 From: jkoan Date: Sun, 12 Jun 2022 15:58:55 +0200 Subject: [PATCH 31/49] 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 37bd3d9386c64854a77533354d54a0415861bcfb Mon Sep 17 00:00:00 2001 From: jkoan Date: Sun, 12 Jun 2022 20:18:13 +0200 Subject: [PATCH 32/49] 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 43ec4b9a45a35848baa80be018d3579eaae06471 Mon Sep 17 00:00:00 2001 From: jkoan Date: Tue, 14 Jun 2022 07:16:58 +0200 Subject: [PATCH 33/49] 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 c2ff7f26da94d83865cb82ab76f6d286e6853188 Mon Sep 17 00:00:00 2001 From: jkoan Date: Tue, 14 Jun 2022 07:17:38 +0200 Subject: [PATCH 34/49] 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 d2997ef83fd8ee953630da04b2179ca55bb9ad4e Mon Sep 17 00:00:00 2001 From: jkoan Date: Tue, 14 Jun 2022 07:39:03 +0200 Subject: [PATCH 35/49] 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 7a1f200905bf44ea0ffe9f26033a00d04413a891 Mon Sep 17 00:00:00 2001 From: jkoan Date: Tue, 14 Jun 2022 07:43:20 +0200 Subject: [PATCH 36/49] 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 dd0cb26466a90b39e04d6d5d1628a90f3cb434e0 Mon Sep 17 00:00:00 2001 From: jkoan Date: Tue, 14 Jun 2022 07:47:43 +0200 Subject: [PATCH 37/49] 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 b0fea3827f6f329ab320c9e3751065bd0dc2cd5f Mon Sep 17 00:00:00 2001 From: jkoan Date: Tue, 14 Jun 2022 08:03:51 +0200 Subject: [PATCH 38/49] 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 3dd6375b3f4bce4adc770814d5e75a85259162cf Mon Sep 17 00:00:00 2001 From: jkoan Date: Tue, 14 Jun 2022 08:12:49 +0200 Subject: [PATCH 39/49] 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 4f73de71032cc207b3fecfe1e8c00a9f3a230e48 Mon Sep 17 00:00:00 2001 From: jkoan Date: Tue, 14 Jun 2022 13:14:40 +0200 Subject: [PATCH 40/49] 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 c01e0b5ca9492105e33bf1893e00c109265823da Mon Sep 17 00:00:00 2001 From: jkoan Date: Tue, 14 Jun 2022 13:22:06 +0200 Subject: [PATCH 41/49] 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 b7d66edb957523b76a6fa7695a0c524ad4df020a Mon Sep 17 00:00:00 2001 From: jkoan Date: Tue, 14 Jun 2022 13:27:05 +0200 Subject: [PATCH 42/49] 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: From 1268dbdf54be27f93276795bffbf304c0451c576 Mon Sep 17 00:00:00 2001 From: jkoan Date: Fri, 20 Dec 2024 07:11:36 +0000 Subject: [PATCH 43/49] Update actions/upload-artifact to v4 --- .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 682769b976..1f7b84bcb3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: 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 + - uses: actions/upload-artifact@v4 with: name: Linux Artifacts path: linux/_CPack_Packages @@ -148,7 +148,7 @@ jobs: - name: Build for Windows run: | bash scripts/build_win32.sh - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: Win32 path: win32/navit.exe @@ -189,7 +189,7 @@ jobs: apt-get install -y xsltproc - name: Build for Tomtom (minimal) run: bash scripts/build_tomtom_minimal.sh - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: Tomtom Minimal path: /output @@ -210,7 +210,7 @@ jobs: - name: Build for Tomtom (plugin) run: | bash scripts/build_tomtom_plugin.sh - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: Tomtom Plugin path: /output From e33aebb870b0b83f7ca0aee4db00e76bd3aecdce Mon Sep 17 00:00:00 2001 From: jkoan Date: Fri, 20 Dec 2024 07:14:15 +0000 Subject: [PATCH 44/49] Update Rest of uploads as well --- .github/workflows/build.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1f7b84bcb3..b7cf45eda6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: # FIXME: deactivated as somethings broken with it #- name: Run CheckStyle Test # run: ./gradlew checkstyleMain - #- uses: actions/upload-artifact@v1 + #- uses: actions/upload-artifact@v4 # with: # name: Store checkstyle report # path: navit/android/checkstyle @@ -63,7 +63,7 @@ jobs: run: cd navit && doxygen - name: Update results to Github run: bash scripts/update_doxygen.sh - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 with: path: /root/project/doc build_sailfish: @@ -78,7 +78,7 @@ jobs: run: sudo -E bash contrib/sailfish/build_sailfish_ci.sh env: VERSION_ID: 4.4.0.64 - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 with: name: Store rpm path: rpmbuild/RPMS/ @@ -107,23 +107,23 @@ jobs: ./gradlew lint test - name: Run Javadoc run: ./gradlew generateDebugJavadoc - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: Store APK path: build/outputs/apk - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: Store logs path: build/outputs/logs - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: Store Javadoc path: build/outputs/docs/javadoc - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: Store Lint reports path: build/reports - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: Android Test-results path: test-results @@ -169,7 +169,7 @@ jobs: bash scripts/setup_wince.sh - name: Build for Windows CE run: bash scripts/build_wince.sh - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 with: path: wince/output name: WinCE Binary From 10e7fa1af0c3db84eded6a4ac0b61f436ce2a505 Mon Sep 17 00:00:00 2001 From: jkoan Date: Fri, 20 Dec 2024 07:24:17 +0000 Subject: [PATCH 45/49] Update wince to new image --- .github/workflows/build.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b7cf45eda6..dbf69925ab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -159,23 +159,26 @@ jobs: runs-on: ubuntu-latest needs: sanity_check container: - image: navit/dockerfiles:wince + image: ghcr.io/enlyze/windows-ce-build-environment-arm steps: - uses: actions/checkout@v1 - - run: | - apt-get update && apt-get install -y git-core + + #- run: apt-get update && apt-get install -y git-core + - name: Prepare the WinCE build environment - run: | - bash scripts/setup_wince.sh + run: bash scripts/setup_wince.sh + - name: Build for Windows CE run: bash scripts/build_wince.sh + - uses: actions/upload-artifact@v4 with: path: wince/output name: WinCE Binary + - name: Update Navit-Download-Center - run: | - bash scripts/update_download_center.sh + run: bash scripts/update_download_center.sh + build_tomtom_minimal: runs-on: ubuntu-latest needs: sanity_check From 1bf73b0536a9b4e5ea23f72c96d19b44f0fc725b Mon Sep 17 00:00:00 2001 From: jkoan Date: Fri, 20 Dec 2024 07:26:54 +0000 Subject: [PATCH 46/49] Update Win32 image and changes from #1267 --- .github/workflows/build.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dbf69925ab..f9212970ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -134,17 +134,13 @@ jobs: runs-on: ubuntu-latest needs: sanity_check container: - image: ubuntu:16.04 + image: ubuntu:24.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 + run: bash scripts/setup_win32.sh - name: Build for Windows run: | bash scripts/build_win32.sh From 14f064b88874c3ed3777d9da0d540e458ea6afc9 Mon Sep 17 00:00:00 2001 From: jkoan Date: Fri, 20 Dec 2024 07:43:37 +0000 Subject: [PATCH 47/49] Pull from Maven Central --- gradle/scripts/git-scm-version.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/scripts/git-scm-version.gradle b/gradle/scripts/git-scm-version.gradle index c6a7cfa094..a8ad84d0fb 100644 --- a/gradle/scripts/git-scm-version.gradle +++ b/gradle/scripts/git-scm-version.gradle @@ -2,7 +2,7 @@ buildscript { repositories { - jcenter() + mavenCentral() } dependencies { classpath 'org.ajoberstar:grgit:2.3.0' From 777d82d92c24b1d5ce720528aeda47ac92f0489a Mon Sep 17 00:00:00 2001 From: jkoan Date: Fri, 20 Dec 2024 12:51:57 +0000 Subject: [PATCH 48/49] Upldate to newer image --- .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 f9212970ca..1801680484 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -179,7 +179,7 @@ jobs: runs-on: ubuntu-latest needs: sanity_check container: - image: navit/tomtom-ng + image: ghcr.io/navit-gps/tomtom:master steps: - uses: actions/checkout@v2 - name: Prepare the tomtom build environment @@ -199,7 +199,7 @@ jobs: runs-on: ubuntu-latest needs: sanity_check container: - image: navit/tomtom-ng + image: ghcr.io/navit-gps/tomtom:master steps: - uses: actions/checkout@v2 - name: Prepare the tomtom build environment From 676f746a38e3ba798445ecc766922720d96f78de Mon Sep 17 00:00:00 2001 From: jkoan Date: Fri, 20 Dec 2024 13:54:33 +0100 Subject: [PATCH 49/49] Update build.yml