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

Commit 0f47a4fc authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch 'upstream/main' into 1292-Update_with_upstream

parents 07742bff 03d91e21

.github/FUNDING.yml

+2 −1
Original line number Diff line number Diff line 


custom: [ 'https://icsx5.bitfire.at/donate/' ]
 
github: bitfireAT

custom: 'https://icsx5.bitfire.at/donate/'

.github/release.yml

0 → 100644
+17 −0
Original line number Diff line number Diff line 
changelog:

  exclude:

    labels:

      - ignore-for-release

  categories:

    - title: New features

      labels:

        - enhancement

    - title: Bug fixes

      labels:

        - bug

    - title: Refactoring

      labels:

        - refactoring

    - title: Other changes

      labels:

        - "*"

.github/workflows/codeql.yml

0 → 100644
+49 −0
Original line number Diff line number Diff line 
name: "CodeQL"



on:

  push:

    branches: [ "dev", main ]

  pull_request:

    # The branches below must be a subset of the branches above

    branches: [ "dev" ]

  schedule:

    - cron: '34 7 * * 3'



jobs:

  analyze:

    name: Analyze

    runs-on: ubuntu-latest

    permissions:

      actions: read

      contents: read

      security-events: write



    strategy:

      fail-fast: false

      matrix:

        language: [ 'java' ]



    steps:

    - name: Checkout repository

      uses: actions/checkout@v3

      with:

        submodules: recursive

    - uses: actions/setup-java@v3

      with:

        distribution: 'temurin'

        java-version: 17

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



    # Initializes the CodeQL tools for scanning.

    - name: Initialize CodeQL

      uses: github/codeql-action/init@v2

      with:

        languages: ${{ matrix.language }}



    - name: Build

      run: ./gradlew --no-daemon app:assembleStandardDebug



    - name: Perform CodeQL Analysis

      uses: github/codeql-action/analyze@v2

      with:

        category: "/language:${{matrix.language}}"

.github/workflows/dependent-issues.yml

0 → 100644
+54 −0
Original line number Diff line number Diff line 
name: Dependent Issues



on:

  issues:

    types:

      - opened

      - edited

      - closed

      - reopened

  pull_request_target:

    types:

      - opened

      - edited

      - closed

      - reopened

      # Makes sure we always add status check for PRs. Useful only if

      # this action is required to pass before merging. Otherwise, it

      # can be removed.

      - synchronize



  # Schedule a daily check. Useful if you reference cross-repository

  # issues or pull requests. Otherwise, it can be removed.

  schedule:

    - cron: '12 9 * * *'



permissions: write-all



jobs:

  check:

    runs-on: ubuntu-latest

    steps:

      - uses: z0al/dependent-issues@v1

        env:

          # (Required) The token to use to make API calls to GitHub.

          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

          # (Optional) The token to use to make API calls to GitHub for remote repos.

          GITHUB_READ_TOKEN: ${{ secrets.DEPENDENT_ISSUES_READ_TOKEN }}



        with:

          # (Optional) The label to use to mark dependent issues

          # label: dependent



          # (Optional) Enable checking for dependencies in issues.

          # Enable by setting the value to "on". Default "off"

          check_issues: on



          # (Optional) A comma-separated list of keywords. Default

          # "depends on, blocked by"

          keywords: depends on, blocked by



          # (Optional) A custom comment body. It supports `{{ dependencies }}` token.

          comment: >

            This PR/issue depends on:

            {{ dependencies }}

.github/workflows/release.yml

+8 −8
Original line number Diff line number Diff line
@@ -10,21 +10,21 @@ jobs: 
      contents: write

    runs-on: ubuntu-latest

    steps:

      - uses: actions/checkout@v2

      - uses: actions/checkout@v3

        with:

          submodules: true

      - uses: actions/setup-java@v2

      - uses: actions/setup-java@v3

        with:

          distribution: 'temurin'

          java-version: 11

          cache: 'gradle'

      - uses: gradle/wrapper-validation-action@v1

          java-version: 17

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



      - name: Prepare keystore

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



      - name: Build signed packages

        run: ./gradlew app:assembleRelease

        # AboutLibraries 10.6.3 doesn't show any dependencies when configuration cache is used

        run: ./gradlew --no-configuration-cache --no-daemon app:assembleRelease

        env:

          ANDROID_KEYSTORE: ${{ github.workspace }}/keystore.jks

          ANDROID_KEYSTORE_PASSWORD: ${{ secrets.android_keystore_password }}
@@ -32,10 +32,11 @@ jobs: 
          ANDROID_KEY_PASSWORD: ${{ secrets.android_key_password }}



      - name: Create Github release (from standard flavor)

        uses: softprops/action-gh-release@v0.1.14

        uses: softprops/action-gh-release@v1

        with:

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

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

          generate_release_notes: true

          fail_on_unmatched_files: true



      - name: Upload to Google Play (gplay flavor)
@@ -47,4 +48,3 @@ jobs: 
          mappingFile: app/build/outputs/mapping/gplayRelease/mapping.txt

          track: internal

          status: draft