Merge tag 'v4.5.8-ose' of https://github.com/bitfireAT/davx5-ose into main-ose (ccac9b5b) · Commits · e / os / AccountManager

.github/dependabot.yml

+5 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,9 @@ updates:
		interval: "weekly"
		commit-message:
		prefix: "[CI] "
		labels:
		- "github_actions"
		- "dependencies"
		groups:
		ci-actions:
		patterns: ["*"]
		@@ -17,6 +20,8 @@ updates:
		directory: "/"
		schedule:
		interval: "weekly"
		labels: # don't create "java" label (default for gradle ecosystem)
		- "dependencies"
		groups:
		app-dependencies:
		patterns: ["*"]

.github/workflows/codeql.yml

+5 −13

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ on:
		branches: [ main-ose ]
		schedule:
		- cron: '22 10 * * 1'

		concurrency:
		group: codeql-${{ github.ref }}
		cancel-in-progress: true
		@@ -21,11 +22,6 @@ jobs:
		contents: read
		security-events: write

		strategy:
		fail-fast: false
		matrix:
		language: [ 'java' ]

		steps:
		- name: Checkout repository
		uses: actions/checkout@v6
		@@ -42,15 +38,11 @@ jobs:
		- name: Initialize CodeQL
		uses: github/codeql-action/init@v4
		with:
		languages: ${{ matrix.language }}

		# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
		# If this step fails, then you should remove it and run the build manually (see below)
		#- name: Autobuild
		# uses: github/codeql-action/autobuild@v2
		languages: java-kotlin
		build-mode: manual # autobuild uses older JDK

		- name: Build
		run: ./gradlew --build-cache --configuration-cache --no-daemon app:assembleOseDebug
		- name: Build # we must not use build cache here
		run: ./gradlew --no-daemon --configuration-cache app:assembleDebug

		- name: Perform CodeQL Analysis
		uses: github/codeql-action/analyze@v4

.github/workflows/dependency-submission.yml

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		name: Dependency Submission

		on:
		push:
		branches: [ 'main-ose' ]

		permissions:
		contents: write

		jobs:
		dependency-submission:
		runs-on: ubuntu-latest
		steps:
		- uses: actions/checkout@v6
		- uses: actions/setup-java@v5
		with:
		distribution: temurin
		java-version: 21

		- name: Generate and submit dependency graph
		uses: gradle/actions/dependency-submission@v5
		with:
		cache-encryption-key: ${{ secrets.gradle_encryption_key }}
		dependency-graph-exclude-configurations: '.[Tt]est. .[cC]heck.'

.github/workflows/test-dev.yml

+70 −24

Original line number	Diff line number	Diff line
		@@ -9,10 +9,19 @@ concurrency:
		group: test-dev-${{ github.ref }}
		cancel-in-progress: true

		# We provide a remote gradle build cache. Take the settings from the secrets and enable
		# configuration and build cache for all gradle jobs.
		#
		# Note: The secrets are not available for forks and Dependabot PRs.
		env:
		GRADLE_BUILDCACHE_URL: ${{ secrets.gradle_buildcache_url }}
		GRADLE_BUILDCACHE_USERNAME: ${{ secrets.gradle_buildcache_username }}
		GRADLE_BUILDCACHE_PASSWORD: ${{ secrets.gradle_buildcache_password }}
		GRADLE_OPTS: -Dorg.gradle.caching=true -Dorg.gradle.configuration-cache=true

		jobs:
		compile:
		name: Compile for build cache
		if: github.ref == 'refs/heads/main-ose'
		name: Compile
		runs-on: ubuntu-latest
		steps:
		- uses: actions/checkout@v6
		@@ -22,16 +31,31 @@ jobs:
		java-version: 21

		# See https://community.gradle.org/github-actions/docs/setup-gradle/ for more information
		- uses: gradle/actions/setup-gradle@v5 # creates build cache
		- uses: gradle/actions/setup-gradle@v5
		with:
		cache-encryption-key: ${{ secrets.gradle_encryption_key }}
		dependency-graph: generate-and-submit # submit Github Dependency Graph info
		cache-read-only: false # allow branches to update their configuration cache
		gradle-home-cache-excludes: caches/build-cache-1 # don't cache local build cache because we use a remote cache

		- name: Cache Android environment
		uses: actions/cache@v5
		with:
		path: ~/.config/.android # needs to be cached so that configuration cache can work
		key: android-${{ hashFiles('app/build.gradle.kts') }}

		- name: Compile
		run: ./gradlew app:compileOseDebugSource

		- run: ./gradlew --build-cache --configuration-cache app:compileOseDebugSource
		# Cache configurations for the other jobs (including assemble for CodeQL)
		- name: Populate configuration cache
		run: \|
		./gradlew --dry-run app:assembleDebug
		./gradlew --dry-run app:lintOseDebug
		./gradlew --dry-run app:testOseDebugUnitTest
		./gradlew --dry-run app:virtualOseDebugAndroidTest

		test:
		unit_tests:
		needs: compile
		if: ${{ !cancelled() }} # even if compile didn't run (because not on main branch)
		name: Lint and unit tests
		runs-on: ubuntu-latest
		steps:
		@@ -45,14 +69,20 @@ jobs:
		cache-encryption-key: ${{ secrets.gradle_encryption_key }}
		cache-read-only: true

		- name: Run lint
		run: ./gradlew --build-cache --configuration-cache app:lintOseDebug
		- name: Run unit tests
		run: ./gradlew --build-cache --configuration-cache app:testOseDebugUnitTest
		- name: Restore Android environment
		uses: actions/cache/restore@v5
		with:
		path: ~/.config/.android
		key: android-${{ hashFiles('app/build.gradle.kts') }}

		- name: Lint checks
		run: ./gradlew app:lintOseDebug

		- name: Unit tests
		run: ./gradlew app:testOseDebugUnitTest

		test_on_emulator:
		instrumented_tests:
		needs: compile
		if: ${{ !cancelled() }} # even if compile didn't run (because not on main branch)
		name: Instrumented tests
		runs-on: ubuntu-latest
		steps:
		@@ -66,25 +96,41 @@ jobs:
		cache-encryption-key: ${{ secrets.gradle_encryption_key }}
		cache-read-only: true

		- name: Restore Android environment
		uses: actions/cache/restore@v5
		with:
		path: ~/.config/.android
		key: android-${{ hashFiles('app/build.gradle.kts') }}

		# gradle and Android SDK often take more space than what is available on the default runner.
		# We try to free a few GB here to make gradle-managed devices more reliable.
		- name: Free some disk space
		uses: jlumbroso/free-disk-space@main
		with:
		android: false # we need the Android SDK
		large-packages: false # apt takes too long
		swap-storage: false # gradle needs much memory

		- name: Restore AVD
		id: restore-avd
		uses: actions/cache/restore@v5
		with:
		path: ~/.config/.android/avd # where AVD is stored
		key: avd-${{ hashFiles('app/build.gradle.kts') }} # gradle-managed devices are defined there

		# Enable virtualization for Android emulator
		- name: Enable KVM group perms
		run: \|
		echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' \| sudo tee /etc/udev/rules.d/99-kvm4all.rules
		sudo udevadm control --reload-rules
		sudo udevadm trigger --name-match=kvm

		- name: Restore cached AVD
		id: restore-avd
		uses: actions/cache/restore@v4
		with:
		path: ~/.config/.android/avd
		key: avd-${{ hashFiles('app/build.gradle.kts') }} # gradle-managed devices are defined there

		- name: Run device tests
		run: ./gradlew --build-cache --configuration-cache app:virtualCheck
		- name: Instrumented tests
		run: ./gradlew app:virtualOseDebugAndroidTest

		- name: Cache AVD
		uses: actions/cache/save@v4
		uses: actions/cache/save@v5
		if: steps.restore-avd.outputs.cache-hit != 'true'
		with:
		path: ~/.config/.android/avd
		path: ~/.config/.android/avd # where AVD is stored
		key: avd-${{ hashFiles('app/build.gradle.kts') }} # gradle-managed devices are defined there

.tx/config

+3 −1

Original line number	Diff line number	Diff line
		[main]
		host = https://www.transifex.com
		lang_map = ar_SA: ar, en_GB: en-rGB, fa_IR: fa-rIR, fi_FI: fi, nb_NO: nb, pt_BR: pt-rBR, sk_SK: sk, sl_SI: sl, tr_TR: tr, zh_CN: zh, zh_TW: zh-rTW
		lang_map = ar_SA: ar, en_GB: en-rGB, fi_FI: fi, mr_IN: mr-rIN, nb_NO: nb, pt_BR: pt-rBR, sk_SK: sk, sl_SI: sl, tr_TR: tr, zh_CN: zh, zh_TW: zh-rTW

		[o:bitfireAT:p:davx5:r:app]
		file_filter = app/src/main/res/values-<lang>/strings.xml
		@@ -20,6 +20,7 @@ source_lang = en
		type = TXT
		minimum_perc = 100
		resource_name = Metadata: short description
		lang_map = ar_SA: ar, en_GB: en-rGB, fi_FI: fi, mr_IN: mr-rIN, nb_NO: nb, pt_BR: pt-rBR, sk_SK: sk, sl_SI: sl, tr_TR: tr, zh_CN: zh, zh_TW: zh-rTW

		[o:bitfireAT:p:davx5:r:metadata-full-description]
		file_filter = fastlane/metadata/android/<lang>/full_description.txt
		@@ -28,3 +29,4 @@ source_lang = en
		type = TXT
		minimum_perc = 100
		resource_name = Metadata: full description
		lang_map = ar_SA: ar, en_GB: en-rGB, fi_FI: fi, mr_IN: mr-rIN, nb_NO: nb, pt_BR: pt-rBR, sk_SK: sk, sl_SI: sl, tr_TR: tr, zh_CN: zh, zh_TW: zh-rTW