From 6f719f3111bf4694561f45023d6bd07631a5755c Mon Sep 17 00:00:00 2001 From: andrekir Date: Sat, 11 Dec 2021 19:06:24 -0300 Subject: [PATCH 1/2] undo 365da25 & update curfirmwareversion.xml --- app/special/curfirmwareversion.xml | 5 +++-- app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/special/curfirmwareversion.xml b/app/special/curfirmwareversion.xml index d154316f7..ee8340b5e 100644 --- a/app/special/curfirmwareversion.xml +++ b/app/special/curfirmwareversion.xml @@ -2,8 +2,9 @@ +Generated by Meshtastic-device/bin/buildall.sh --> - 0.2.0 + 0.2.0.abcdefg + 0.2.0 diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt index 5983ba18c..29b98e8eb 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt @@ -499,7 +499,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging { if (model.isConnected.value == MeshService.ConnectionState.CONNECTED && info != null && info.shouldUpdate && info.couldUpdate && service != null) { binding.updateFirmwareButton.visibility = View.VISIBLE binding.updateFirmwareButton.text = - getString(R.string.update_to).format(getString(R.string.cur_firmware_version)) + getString(R.string.update_to).format(getString(R.string.short_firmware_version)) val progress = service.updateStatus From 715fb6c1085c754191fdf116bf6b09764e089880 Mon Sep 17 00:00:00 2001 From: andrekir Date: Sat, 11 Dec 2021 19:38:02 -0300 Subject: [PATCH 2/2] update github actions --- .github/workflows/android.yml | 2 +- .github/workflows/release.yml | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index bc7da1edb..c2ed9158c 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -20,7 +20,7 @@ jobs: rm ./app/google-services.json echo $GSERVICES > ./app/google-services.json rm ./app/src/main/res/values/mapbox-token.xml - echo "\n $MAPBOXTOKEN\n" > ./app/src/main/res/values/mapbox-token.xml + echo -e "\n $MAPBOXTOKEN\n" > ./app/src/main/res/values/mapbox-token.xml mkdir -p ~/.gradle echo "MAPBOX_DOWNLOADS_TOKEN=$MAPBOXTOKEN" >>~/.gradle/gradle.properties env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0acc6e480..0f2f5821a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: rm ./app/google-services.json echo $GSERVICES > ./app/google-services.json rm ./app/src/main/res/values/mapbox-token.xml - echo "\n $MAPBOXTOKEN\n" > ./app/src/main/res/values/mapbox-token.xml + echo -e "\n $MAPBOXTOKEN\n" > ./app/src/main/res/values/mapbox-token.xml mkdir -p ~/.gradle echo "MAPBOX_DOWNLOADS_TOKEN=$MAPBOXTOKEN" >> ~/.gradle/gradle.properties echo $KEYSTORE | base64 -di > ./app/$KEYSTORE_FILENAME @@ -34,10 +34,6 @@ jobs: KEYSTORE_FILENAME: ${{ secrets.KEYSTORE_FILENAME }} KEYSTORE_PROPERTIES: ${{ secrets.KEYSTORE_PROPERTIES }} - - name: Mock curfirmware version for CI - run: | - rm ./app/src/main/res/values/curfirmwareversion.xml - cp ./app/special/curfirmwareversion.xml ./app/src/main/res/values/ - name: Set up JDK 11 uses: actions/setup-java@v2 with: @@ -52,20 +48,27 @@ jobs: repo_path: meshtastic/Meshtastic-device github_token: ${{ secrets.GITHUB_TOKEN }} - - name: Get version strings from tags - run: echo "FIRMWARE_VERSION=$(echo ${{ steps.firmware_latest.outputs.tag_name }}|sed -e 's/^v//')" >> $GITHUB_ENV + - name: Get version strings from tag_name + run: | + echo "CUR_FIRMWARE_VERSION=$(echo ${{ steps.firmware_latest.outputs.tag_name }}|sed -e 's/^v//')" >> $GITHUB_ENV + echo "SHORT_FIRMWARE_VERSION=$(echo ${{ steps.firmware_latest.outputs.tag_name }}|sed -e 's/^v//' -e 's/.\{8\}$//')" >> $GITHUB_ENV + + - name: Create curfirmwareversion.xml latest + run: | + rm ./app/src/main/res/values/curfirmwareversion.xml + echo -e "\n ${{ env.CUR_FIRMWARE_VERSION }}\n ${{ env.SHORT_FIRMWARE_VERSION }}\n" > ./app/src/main/res/values/curfirmwareversion.xml - name: Pull firmware latest uses: dsaltares/fetch-gh-release-asset@master with: repo: meshtastic/Meshtastic-device - file: firmware-${{ env.FIRMWARE_VERSION }}.zip + file: firmware-${{ env.CUR_FIRMWARE_VERSION }}.zip target: firmware.zip token: ${{ secrets.GITHUB_TOKEN }} - name: Unzip firmware into assets/firmware run: | - rm -f app/src/main/assets/firmware + rm -rf app/src/main/assets/firmware mkdir -p app/src/main/assets/firmware unzip -qq firmware.zip 'firmware-*.bin' 'spiffs-*.bin' -d app/src/main/assets/firmware rm firmware.zip @@ -105,4 +108,3 @@ jobs: asset_path: app/build/outputs/apk/release/app-release.apk asset_name: app-release-${{ github.event.inputs.version}}.apk asset_content_type: application/zip -