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

Unverified Commit 8ddd3d66 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Version bump to 4.3.11-alpha.2, CI: hopefully speed up release workflow

parent a27a4fc7

.github/workflows/release.yml

+14 −1
Original line number Diff line number Diff line
@@ -3,9 +3,14 @@ on: 
  push:

    tags:

      - v*



concurrency:

  group: ${{ github.workflow }}-${{ github.ref }}

  cancel-in-progress: true



env:

  prerelease: ${{ contains(github.ref_name, '-alpha') || contains(github.ref_name, '-beta') || contains(github.ref_name, '-rc') }}



jobs:

  build:

    name: Create release
@@ -20,6 +25,14 @@ jobs: 
          java-version: 17

      - uses: gradle/gradle-build-action@v2



      - name: Use app/build and gradle configuration cache

        uses: actions/cache/restore@v3

        with:

          key: app_build-tests-without-emulator

          path: |

            .gradle/configuration-cache

            app/build



      - name: Prepare keystore

        run: echo ${{ secrets.android_keystore_base64 }} | base64 -d >$GITHUB_WORKSPACE/keystore.jks

      - name: Build signed package
@@ -35,6 +48,6 @@ jobs: 
      - name: Create Github release

        uses: softprops/action-gh-release@v1

        with:

          prerelease: ${{ contains(github.ref_name, '-alpha') || contains(github.ref_name, '-beta') || contains(github.ref_name, '-rc') }}

          prerelease: ${{ env.prerelease }}

          files: app/build/outputs/apk/ose/release/*.apk

          fail_on_unmatched_files: true

.github/workflows/test-dev.yml

+6 −2
Original line number Diff line number Diff line 
name: Development tests

on: push

on:

  push:

    branches:

      - '*'



concurrency:

  group: ${{ github.workflow }}-${{ github.ref }}

  cancel-in-progress: true

jobs:



jobs:

  test:

    name: Tests without emulator

    runs-on: ubuntu-latest

app/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ android { 
    defaultConfig {

        applicationId "at.bitfire.davdroid"



        versionCode 403100003

        versionName '4.3.10'

        versionCode 403110003

        versionName '4.3.11-alpha.2'



        buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"