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

Commit ddfd6862 authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Merge remote-tracking branch 'origin/master'

parents d5c4531b 7df105f0
Loading
Loading
Loading
Loading
+30 −24
Original line number Original line Diff line number Diff line
name: Android CI
name: Android CI


on: [push, pull_request]
on: [push, pull_request]

jobs:
jobs:
  validation:
  validation:
    name: Validate Gradle Wrapper
    name: Validate Gradle Wrapper
    runs-on: ubuntu-latest
    runs-on: ubuntu-latest
    steps:
    steps:
      - uses: actions/checkout@v2
      - name: Checkout
      - uses: gradle/wrapper-validation-action@v1
        uses: actions/checkout@v2
      - name: Validate Gradle Wrapper
        uses: gradle/wrapper-validation-action@v1


  test:
  test:
    name: Unit Tests
    name: Unit tests
    runs-on: ubuntu-18.04
    runs-on: ubuntu-latest

    steps:
    steps:
      - uses: actions/checkout@v2
      - name: Checkout
      - name: set up JDK 1.8
        uses: actions/checkout@v2
        uses: actions/setup-java@v1
        with:
          java-version: 1.8
      - name: Unit tests
      - name: Unit tests
        run: bash ./gradlew test --stacktrace
        run: bash ./gradlew test --stacktrace


  instrumented:
  instrumented:
    name: Android instrumented tests
    name: Android instrumented tests
    runs-on: macos-latest
    runs-on: macos-latest

    steps:
    steps:
      - uses: actions/checkout@v2
      - name: Checkout
      - name: set up JDK 1.8
        uses: actions/checkout@v2
        uses: actions/setup-java@v1
        with:
          java-version: 1.8
      - name: Android instrumented tests
      - name: Android instrumented tests
        uses: reactivecircus/android-emulator-runner@v2
        uses: reactivecircus/android-emulator-runner@v2
        with:
        with:
          api-level: 29
          api-level: 29
          script: ./gradlew connectDevDebugAndroidTest --stacktrace
          script: ./gradlew connectDevDebugAndroidTest --stacktrace


  codeql:
    name: CodeQL security scan
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
        uses: actions/checkout@v2
      - name: Initialize CodeQL
        uses: github/codeql-action/init@v1
        with:
          languages: java
      - name: Build debug APK
        run: bash ./gradlew assembleDev --stacktrace
      - name: Perform CodeQL Analysis
        uses: github/codeql-action/analyze@v1

  apk:
  apk:
    name: Generate APK
    name: Generate APK
    runs-on: ubuntu-18.04
    runs-on: ubuntu-latest

    steps:
    steps:
      - uses: actions/checkout@v2
      - name: Checkout
      - name: set up JDK 1.8
        uses: actions/checkout@v2
        uses: actions/setup-java@v1
        with:
          java-version: 1.8
      - name: Build debug APK
      - name: Build debug APK
        run: bash ./gradlew assembleDev --stacktrace
        run: bash ./gradlew assembleDev --stacktrace
      - name: Upload APK
      - name: Upload APK
+1 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@


    <!-- Settings -->
    <!-- Settings -->
    <string name="settings_note_mode">Display mode for notes</string>
    <string name="settings_note_mode">Display mode for notes</string>
    <string name="settings_theme_title">Dark theme</string>
    <string name="settings_theme_title">Theme</string>
    <string name="settings_font_title">Monospace font</string>
    <string name="settings_font_title">Monospace font</string>
    <string name="settings_font_size">Font size</string>
    <string name="settings_font_size">Font size</string>
    <string name="settings_wifi_only">Sync only on Wi-Fi</string>
    <string name="settings_wifi_only">Sync only on Wi-Fi</string>