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

Commit d2095aa1 authored by Ashley's avatar Ashley
Browse files

Merge branch 'main' into fix-9850-edge2edge

parents 98bec168 18a8c09a

.github/actions/setup-gradle/action.yml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ runs: 
        java-version: '21'



    - name: Set up Gradle without cache

      uses: gradle/actions/setup-gradle@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # v4.4.4

      uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

      with:

        cache-disabled: ${{ inputs.run-release }}

        add-job-summary: ${{ inputs.add-job-summary }}

.github/workflows/dependabot-dependency-guard-update.yml

+3 −3
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ jobs: 
          ref: ${{ github.head_ref }}

          token: ${{ steps.app-token.outputs.token || github.token }}



      - name: Prepares environment

        uses: ./.github/actions/setup

      - name: Setup Gradle environment

        uses: ./.github/actions/setup-gradle



      - name: Update dependency guard

        run: ./gradlew dependencyGuardBaseline

.github/workflows/deploy-docs.yml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ jobs: 
          token: ${{ steps.app-token.outputs.token || github.token }}



      - name: Cargo cache

        uses: actions-rust-lang/setup-rust-toolchain@02be93da58aa71fb456aa9c43b301149248829d8  # v1.15.1

        uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c  # v1.15.2



      - name: Install mdbook and extensions

        run: ./docs/install.sh

.github/workflows/fluidscan.yml

+1 −1
Original line number Diff line number Diff line
@@ -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@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5

        uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6

        with:

          sarif_file: fluidscan-results.sarif

.github/workflows/markdown.yml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ jobs: 
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0



      - name: Cargo cache

        uses: actions-rust-lang/setup-rust-toolchain@02be93da58aa71fb456aa9c43b301149248829d8  # v1.15.1

        uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c  # v1.15.2



      - name: Install mdbook and extensions

        run: ./docs/install.sh