Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4e351e0 authored by Corey Bryant's avatar Corey Bryant Committed by cketti
Browse files

Fixes from latest review

parent 3a43d294

.github/workflows/shippable_builds.yml

+15 −3
Original line number Diff line number Diff line
@@ -250,6 +250,10 @@ jobs: 
            time=$(date -d "${datetime}" +"%H%M")

            echo "${year}${day}${time}"

          }

          # Android version codes max out at 2100000000. If we accidentally reach that number then

          # all we can do is start with a new application id. These protections are meant to avoid

          # unexpected edge cases. If the build fails here please double check the generated version

          # code and bump it a year into the future.

          if [[ "$RELEASE_TYPE" = "beta" || "$RELEASE_TYPE" = "release" ]]; then

            NEW_VERSION_CODE=$(($OLD_VERSION_CODE + 1))

            # Estimated max version code to get through 2025 is "30"
@@ -450,6 +454,7 @@ jobs: 
          add-job-summary: on-failure



      - name: Set Version Code for Daily

        if: ${{ needs.dump_config.outputs.releaseType == 'daily' }}

        shell: bash

        env:

          APP_NAME: ${{ matrix.appName }}
@@ -761,9 +766,16 @@ jobs: 
          elif [[ "$RELEASE_TYPE" = "daily" ]]; then

            COMMIT_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/commit/${GITHUB_SHA}"

            WORKFLOW_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"

            echo "${APP_NAME^} ${VERSION_NAME} (${VERSION_CODE}) Daily Build" | tee whatsnew/whatsnew-en-US

            echo "- Built from GitHub commit: ${COMMIT_URL}" | tee -a whatsnew/whatsnew-en-US

            echo "- Built with GitHub workflow: ${WORKFLOW_URL}" | tee -a whatsnew/whatsnew-en-US

            sed 's/^[[:space:]]*//' > whatsnew/whatsnew-en-US <<EOF

              ${APP_NAME^} ${VERSION_NAME} (${VERSION_CODE}) Daily Build



              The Daily version is an unstable testing and development platform, make sure you back up important data regularly!

              If you find any issues, get in touch at https://github.com/thunderbird/thunderbird-android/issues/ and find us on Matrix at https://matrix.to/#/#tb-android-dev:mozilla.org

              Be prepared to debug the code in Android Studio :-)



              - Built from GitHub commit: ${COMMIT_URL}

              - Built with GitHub workflow: ${WORKFLOW_URL}

            EOF

          fi



      - name: Publish to Google Play