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

Commit 8b983e70 authored by Daniel Darnell's avatar Daniel Darnell
Browse files

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

parents e6e5f2fe 3d81fb05
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ body:
    attributes:
      label: Logs
      description: |
        Please take some time to [retrieve logs](https://github.com/thunderbird/thunderbird-android/wiki/LoggingErrors)
        Please take some time to [retrieve logs](https://thunderbird.github.io/thunderbird-android/docs/latest/user-guide/troubleshooting/collecting-debug-logs.html)
        and attach them here.

        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+6 −6
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ jobs:

    steps:
      - name: Checkout the repo
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          fetch-depth: 1

@@ -61,7 +61,7 @@ jobs:
    needs: [build-common]
    steps:
      - name: Checkout the repo
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          fetch-depth: 1

@@ -85,7 +85,7 @@ jobs:
    needs: [build-common]
    steps:
      - name: Checkout the repo
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          fetch-depth: 1

@@ -113,7 +113,7 @@ jobs:
    needs: [build-common]
    steps:
      - name: Checkout the repo
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          fetch-depth: 1

@@ -130,7 +130,7 @@ jobs:
    needs: [build-common]
    steps:
      - name: Checkout the repo
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          fetch-depth: 1

@@ -147,7 +147,7 @@ jobs:
    needs: [build-common]
    steps:
      - name: Checkout the repo
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          fetch-depth: 1

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ jobs:
    timeout-minutes: 30
    steps:
      - name: Checkout the repo
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          fetch-depth: 1

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ jobs:
    timeout-minutes: 90
    steps:
      - name: App Token Generate
        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
        if: ${{ vars.BOT_CLIENT_ID }}
        id: app-token
        with:
@@ -34,7 +34,7 @@ jobs:
          private-key: ${{ secrets.BOT_PRIVATE_KEY }}

      - name: Checkout the repo
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          ref: ${{ github.head_ref }}
          token: ${{ steps.app-token.outputs.token || github.token }}
+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ jobs:
    environment: botmobile
    steps:
      - name: App token generate
        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42  # v2.1.4
        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94  # v2.2.0
        if: ${{ vars.BOT_CLIENT_ID }}
        id: app-token
        with:
@@ -29,7 +29,7 @@ jobs:
          private-key: ${{ secrets.BOT_PRIVATE_KEY }}

      - name: Checkout
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3  # v6.0.0
        with:
          token: ${{ steps.app-token.outputs.token || github.token }}

@@ -75,7 +75,7 @@ jobs:
          find docs/latest -mindepth 1 -delete  # Delete old files inside docs/latest

          # Copy new docs to gh-pages branch
          cp -r book/docs/latest/html/* docs/latest/
          cp -r book/docs/latest/* docs/latest/

          # Remove
          rm -rf book
Loading