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

Unverified Commit ece3222e authored by Andy Scherzinger's avatar Andy Scherzinger Committed by GitHub
Browse files

Merge branch 'main' into dependabot/gradle/androidx.fragment-fragment-1.6.1 



Signed-off-by: default avatarAndy Scherzinger <info@andy-scherzinger.de>
parents ee03118d afa58092

.github/workflows/android.yml

+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ jobs: 
    runs-on: ubuntu-latest

    steps:

      - name: Checkout

        uses: actions/checkout@v3

        uses: actions/checkout@v4

      - name: Validate Gradle Wrapper

        uses: gradle/wrapper-validation-action@v1
@@ -23,7 +23,7 @@ jobs: 
    runs-on: ubuntu-latest

    steps:

      - name: Checkout

        uses: actions/checkout@v3

        uses: actions/checkout@v4

      - name: Lint

        run: bash ./gradlew lintDevDebug --stacktrace
@@ -32,7 +32,7 @@ jobs: 
    runs-on: ubuntu-latest

    steps:

      - name: Checkout

        uses: actions/checkout@v3

        uses: actions/checkout@v4

      - name: Unit tests

        run: bash ./gradlew test --stacktrace
@@ -41,7 +41,7 @@ jobs: 
    runs-on: ubuntu-latest

    steps:

      - name: Checkout

        uses: actions/checkout@v3

        uses: actions/checkout@v4

      - name: Build debug APK

        run: bash ./gradlew assembleDev --stacktrace

      - name: Upload APK

.github/workflows/codeql.yml

+4 −4
Original line number Diff line number Diff line
@@ -26,17 +26,17 @@ jobs: 
        language: [ 'java' ]

    steps:

      - name: Checkout repository

        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3

        uses: actions/checkout@v4 # v3.5.3

      - name: Set Swap Space

        uses: pierotofy/set-swap-space@49819abfb41bd9b44fb781159c033dba90353a7c # v1.0

        with:

          swap-size-gb: 10

      - name: Initialize CodeQL

        uses: github/codeql-action/init@6c089f53dd51dc3fc7e599c3cb5356453a52ca9e # v2.20.0

        uses: github/codeql-action/init@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5

        with:

          languages: ${{ matrix.language }}

      - name: Set up JDK 17

        uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0

        uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0

        with:

          distribution: "temurin"

          java-version: 17
@@ -46,4 +46,4 @@ jobs: 
          echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"

          ./gradlew assembleDebug

      - name: Perform CodeQL Analysis

        uses: github/codeql-action/analyze@6c089f53dd51dc3fc7e599c3cb5356453a52ca9e # v2.20.0
 
        uses: github/codeql-action/analyze@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5

.github/workflows/command-rebase.yml

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ jobs: 


    steps:

      - name: Add reaction on start

        uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.2

        uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2 # v3.1.0

        with:

          token: ${{ secrets.COMMAND_BOT_PAT }}

          repository: ${{ github.event.repository.full_name }}
@@ -31,7 +31,7 @@ jobs: 
          reaction-type: "+1"



      - name: Checkout the latest code

        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3

        uses: actions/checkout@v4 # v3

        with:

          fetch-depth: 0

          token: ${{ secrets.COMMAND_BOT_PAT }}
@@ -42,7 +42,7 @@ jobs: 
          GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}



      - name: Add reaction on failure

        uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.2

        uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2 # v3.1.0

        if: failure()

        with:

          token: ${{ secrets.COMMAND_BOT_PAT }}

.github/workflows/gradle-wrapper-validation.yml

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ jobs: 
        name: "Validation"

        runs-on: ubuntu-latest

        steps:

            - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3

            - uses: actions/checkout@v4 # v3.5.3

            - uses: gradle/wrapper-validation-action@8d49e559aae34d3e0eb16cde532684bc9702762b # v1.0.6

.github/workflows/scorecard.yml

+3 −3
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ jobs: 


    steps:

      - name: "Checkout code"

        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3

        uses: actions/checkout@v4 # v3.5.3

        with:

          persist-credentials: false



      - name: "Run analysis"

        uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af # v2.1.3

        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1

        with:

          results_file: results.sarif

          results_format: sarif
@@ -37,6 +37,6 @@ jobs: 


      # Upload the results to GitHub's code scanning dashboard.

      - name: "Upload to code-scanning"

        uses: github/codeql-action/upload-sarif@6c089f53dd51dc3fc7e599c3cb5356453a52ca9e # v2.20.0

        uses: github/codeql-action/upload-sarif@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5

        with:

          sarif_file: results.sarif