Uplift changes from main to beta for 9.0b1 (8c624a06) · Commits · e / os / Mail

.github/ISSUE_TEMPLATE/bug_report.yml

+4 −4

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ body:
		id: expected
		attributes:
		label: Expected behavior
		description: After following the steps, what did you think K-9 Mail would do?
		description: After following the steps, what did you think the app would do?
		validations:
		required: true
		- type: textarea
		@@ -77,7 +77,7 @@ body:
		attributes:
		label: Actual behavior
		description: \|
		What did K-9 Mail do instead? Screenshots might help. Usually, you can take a screenshot by pressing
		What did the app do instead? Screenshots might help. Usually, you can take a screenshot by pressing
		Power + Volume down for a few seconds.
		validations:
		required: true

.github/ISSUE_TEMPLATE/config.yml

+4 −1

Original line number	Diff line number	Diff line
		blank_issues_enabled: false
		contact_links:
		- name: Feature Request
		url: https://connect.mozilla.org/t5/ideas/idb-p/ideas/label-name/thunderbird%20android
		about: Submit your ideas to improve Thunderbird for Android.
		- name: Mozilla Support Forum (SUMO)
		url: https://support.mozilla.org/en-US/products/thunderbird-android
		url: https://support.mozilla.org/products/thunderbird-android
		about: Most issues are not bugs. Ask the community for help.

.github/ISSUE_TEMPLATE/feature_request.yml

deleted100644 → 0

+0 −45

Original line number	Diff line number	Diff line
		name: Feature request
		description: Suggest an idea for K-9 Mail
		labels: [ "type: enhancement", "unconfirmed" ]
		body:
		- type: checkboxes
		id: checklist
		attributes:
		label: Checklist
		options:
		- label: I have used the search function to see if someone else has already submitted the same feature request.
		required: true
		- label: I will describe the problem with as much detail as possible.
		required: true
		- label: This issue only contains a request for one single feature, not multiple (related) features.
		required: true
		- type: input
		id: version
		attributes:
		label: App version
		description: The app version you are currently using. You can find it inside the app under Settings → About.
		placeholder: x.yyy
		validations:
		required: true
		- type: textarea
		id: problem
		attributes:
		label: Problem you are trying to solve
		description: Give a brief explanation of the problem you are trying to solve.
		validations:
		required: true
		- type: textarea
		id: solution
		attributes:
		label: Suggested solution
		description: Describe how you would like the app to help you solve that problem. Try to be as specific as possible.
		validations:
		required: true
		- type: textarea
		id: screenshots
		attributes:
		label: Screenshots / Drawings / Technical details
		description: \|
		If your request is about (or includes) changing or extending the user interface (UI), describe what the UI would look like and how the user would interact with it.

		Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.

.github/workflows/needinfo-remove.yml

+8 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ jobs:
		build:
		runs-on: ubuntu-latest
		if: \|
		contains(github.event.issue.labels.*.name, 'status: needs information') &&
		github.event.comment.author_association != 'OWNER' &&
		github.event.comment.author_association != 'MEMBER' &&
		github.event.comment.author_association != 'COLLABORATOR'
		@@ -23,3 +24,10 @@ jobs:
		curl --request DELETE \
		--url 'https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/labels/status%3A%20needs%20information' \
		--header 'Authorization: token ${{ secrets.GITHUB_TOKEN }}'
		- name: Add answered label
		run: \|
		curl --request POST \
		--url 'https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/labels' \
		--header 'Authorization: token ${{ secrets.GITHUB_TOKEN }}' \
		--header 'Content-Type: application/json' \
		--data '{"labels": ["status: answered"]}'

.github/workflows/shippable_builds.yml

+13 −13

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ jobs:
		],
		...matrixFull.map(item => [
		{ data: item.appName },
		{ data: item.packageFlavor \|\| "default" },
		{ data: item.packageFlavor },
		{ data: item.packageFormat },
		{ data: item.releaseTarget?.replace(/\\|/g, ", ") \|\| "artifact only" },
		{ data: item.playTargetTrack \|\| "none" },
		@@ -477,7 +477,7 @@ jobs:
		elif [[ "$APP_NAME" = "thunderbird" && "${PACKAGE_FORMAT}" = "aab" ]]; then
		BUILD_COMMAND="bundle${PACKAGE_FLAVOR^}${RELEASE_TYPE^}"
		elif [[ "$APP_NAME" = "k9mail" ]]; then
		BUILD_COMMAND="assembleRelease"
		BUILD_COMMAND="assemble${PACKAGE_FLAVOR^}Release"
		fi

		echo "BUILDING: :app-${APP_NAME}:${BUILD_COMMAND}"
		@@ -509,9 +509,9 @@ jobs:
		OUT_FILE="app-${APP_NAME}-${PACKAGE_FLAVOR}-${RELEASE_TYPE}.aab"
		UPLOAD_FILE="${APP_NAME}-${PACKAGE_FLAVOR}-${RELEASE_TYPE}.aab"
		elif [[ "$APP_NAME" = "k9mail" ]]; then
		OUT_PATH="${OUT_BASE}/apk/release"
		OUT_FILE="app-${APP_NAME}-release-unsigned.apk"
		UPLOAD_FILE="${APP_NAME}-default-${RELEASE_TYPE}.apk"
		OUT_PATH="${OUT_BASE}/apk/${PACKAGE_FLAVOR}/release"
		OUT_FILE="app-${APP_NAME}-${PACKAGE_FLAVOR}-release-unsigned.apk"
		UPLOAD_FILE="${APP_NAME}-${PACKAGE_FLAVOR}-${RELEASE_TYPE}.apk"
		else
		echo "PACKAGE_FORMAT $PACKAGE_FORMAT is unknown. Exiting."
		exit 23
		@@ -534,7 +534,7 @@ jobs:
		env:
		UPLOAD_PATH: "uploads"
		with:
		name: unsigned-${{ matrix.appName }}-${{ matrix.packageFormat }}-${{ matrix.packageFlavor \|\| 'default' }}
		name: unsigned-${{ matrix.appName }}-${{ matrix.packageFormat }}-${{ matrix.packageFlavor }}
		path: ${{ env.UPLOAD_PATH }}/
		if-no-files-found: error

		@@ -546,13 +546,13 @@ jobs:
		strategy:
		matrix:
		include: "${{ fromJSON(needs.dump_config.outputs.matrixInclude) }}"
		environment: ${{ matrix.appName }}_${{ needs.dump_config.outputs.releaseType }}_${{ matrix.packageFlavor \|\| 'default' }}
		environment: ${{ matrix.appName }}_${{ needs.dump_config.outputs.releaseType }}_${{ matrix.packageFlavor }}
		env:
		RELEASE_TYPE: ${{ needs.dump_config.outputs.releaseType }}
		steps:
		- uses: actions/download-artifact@v4
		with:
		name: unsigned-${{ matrix.appName }}-${{ matrix.packageFormat }}-${{ matrix.packageFlavor \|\| 'default' }}
		name: unsigned-${{ matrix.appName }}-${{ matrix.packageFormat }}-${{ matrix.packageFlavor }}
		path: uploads/

		- uses: noriban/sign-android-release@5f144321d3c7c2233266e78b42360345d8bbe403 # v5.1
		@@ -568,7 +568,7 @@ jobs:
		if: ${{ matrix.packageFormat == 'apk' }}
		env:
		APP_NAME: ${{ matrix.appName }}
		PACKAGE_FLAVOR: ${{ matrix.packageFlavor \|\| 'default' }}
		PACKAGE_FLAVOR: ${{ matrix.packageFlavor }}
		run: \|
		mv uploads/${APP_NAME}-${PACKAGE_FLAVOR}-${RELEASE_TYPE}-signed.apk uploads/${APP_NAME}-${PACKAGE_FLAVOR}-${RELEASE_TYPE}.apk
		rm uploads/*-aligned.apk
		@@ -581,7 +581,7 @@ jobs:
		- name: Upload signed
		uses: actions/upload-artifact@v4
		with:
		name: signed-${{ matrix.appName }}-${{ matrix.packageFormat }}-${{ matrix.packageFlavor \|\| 'default' }}
		name: signed-${{ matrix.appName }}-${{ matrix.packageFormat }}-${{ matrix.packageFlavor }}
		if-no-files-found: error
		path: \|
		uploads/*.apk
		@@ -635,12 +635,12 @@ jobs:
		env:
		RELEASE_TYPE: ${{ needs.dump_config.outputs.releaseType }}
		APP_NAME: ${{ matrix.appName }}
		PACKAGE_FLAVOR: ${{ matrix.packageFlavor \|\| 'default' }}
		PACKAGE_FLAVOR: ${{ matrix.packageFlavor}}
		PACKAGE_FORMAT: ${{ matrix.packageFormat }}
		steps:
		- uses: actions/download-artifact@v4
		with:
		name: signed-${{ matrix.appName }}-${{ matrix.packageFormat }}-${{ matrix.packageFlavor \|\| 'default' }}
		name: signed-${{ matrix.appName }}-${{ matrix.packageFormat }}-${{ matrix.packageFlavor }}
		path: "uploads/"

		- name: Get Package Info
		@@ -733,7 +733,7 @@ jobs:
		- name: Publish to GitHub Releases
		id: publish_gh
		if: ${{ contains(matrix.releaseTarget, 'github') }}
		uses: softprops/action-gh-release@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8 # v2.0.9
		uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
		with:
		token: ${{ steps.app-token.outputs.token \|\| github.token }}
		target_commitish: ${{ steps.shanotes.outputs.app_sha }}