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

Commit 1995eb1f authored by Daniel Darnell's avatar Daniel Darnell
Browse files

Merge remote-tracking branch 'origin/main' into beta

parents b1e43aa2 2fd4ecb4

.github/CODEOWNERS

+3 −3
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 


# Release Engineering

/.github/ @thunderbird/build-release

/docs/ci/ @thunderbird/build-release 

/docs/release/ @thunderbird/build-release

/scripts/ci/ @thunderbird/build-release



# CODEOWNERS protection

/.github/CODEOWNERS @kewisch
 
/.github/CODEOWNERS @Herbal7ea

.github/workflows/fluidscan.yml

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ jobs: 
          bash scripts/ci/run-fluidattacks-scanner.sh



      - name: "Upload scan results"

        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0

        with:

          name: SARIF scan results

          path: fluidscan-results.sarif
@@ -35,6 +35,6 @@ jobs: 


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

      - name: "Upload to code-scanning"

        uses: github/codeql-action/upload-sarif@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8

        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2

        with:

          sarif_file: fluidscan-results.sarif

.github/workflows/pulls-opened.yml

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ jobs: 
            Original Issue/Pull request:

            Regression caused by (issue #):

            User impact if declined:

            Testing completed (on daily, etc.):

            Testing completed (on daily, beta, etc.):

            Introduces or modifies localizable strings (yes/no):

            Risk to taking this patch (and alternatives if risky):

        run: |

          if gh pr view "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --json comments \

.github/workflows/quality-codeql.yml

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ jobs: 
          disable-cache: 'true'



      - name: Initialize CodeQL

        uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8

        uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2

        with:

          languages: ${{ matrix.language }}

          build-mode: ${{ matrix.build-mode }}
@@ -53,6 +53,6 @@ jobs: 
        run: ./gradlew assemble --no-daemon



      - name: Perform CodeQL Analysis

        uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8

        uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2

        with:

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

.github/workflows/scorecard.yml

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ jobs: 


      # Upload the results as artifacts.

      - name: "Upload artifact"

        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0

        with:

          name: SARIF file

          path: results.sarif
@@ -62,6 +62,6 @@ jobs: 


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

      - name: "Upload to code-scanning"

        uses: github/codeql-action/upload-sarif@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8

        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2

        with:

          sarif_file: results.sarif