Apply changes for 3.4.11 release

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,10 +1,6 @@
 name: 🐛 Bug Report
 description: File a bug report
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for filing a bug report! This issue tracker is for [GitHub Desktop](https://desktop.github.com). Please search the issue tracker to see if there is an existing issue for the problem you are experiencing. If you are experiencing issues with the Linux fork of GitHub Desktop please open an issue [in its repository](https://github.com/shiftkey/desktop). If you are experiencing issues with github.com please [contact GitHub Support](https://support.github.com/).
   - type: textarea
     id: the-problem
     attributes:

.github/ISSUE_TEMPLATE/installation-issue.md

@@ -0,0 +1,21 @@
+---
+name: "\U0001F4BB Installation issue"
+about: Report a problem when installing the application
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+### Operating System/Distribution
+
+Which distribution of Linux are you using?
+
+### Installer
+
+Which version of the app?
+Which installer type?
+
+### What happened?
+
+Provide as much detail as possible. Error messages or output are extremely useful.

.github/dependabot.yml

@@ -4,5 +4,16 @@ updates:
     directory: /
     schedule:
       interval: weekly
-    # Disable version updates and keep only security updates
-    open-pull-requests-limit: 0
+  - package-ecosystem: 'npm'
+    directory: '/'
+    open-pull-requests-limit: 5
+    schedule:
+      interval: 'weekly'
+    allow:
+      - dependency-name: 'electron-builder'
+      - dependency-name: 'electron-packager'
+      - dependency-name: 'electron-installer-*'
+      - dependency-name: 'xvfb-maybe'
+      - dependency-name: 'yaml'
+      - dependency-name: 'patch-package'
+      - dependency-name: 'postinstall-postinstall'

.github/workflows/ci-linux.yml

@@ -0,0 +1,150 @@
+name: 'CI / Linux'
+
+on:
+  push:
+    branches:
+      - development
+      - linux
+      - 'linux-release-*'
+    tags:
+      - 'release-*.*.*-linux*'
+      - 'release-*.*.*-test*'
+  pull_request:
+    branches:
+      - linux
+      - linux-vnext
+      - 'linux-release-*'
+
+jobs:
+  arm64:
+    name: Ubuntu arm64
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: ${{ inputs.repository || github.repository }}
+          ref: ${{ inputs.ref }}
+          submodules: recursive
+      - name: Package and test application in container
+        uses: shiftkey/desktop-ubuntu-arm64-packaging@d5a0346959c7d553eb8dbe2828e7fe2e10147160
+      - name: Upload output artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ubuntu-arm64-artifacts
+          path: |
+            dist/*.AppImage
+            dist/*.deb
+            dist/*.rpm
+            dist/*.sha256
+          retention-days: 5
+          if-no-files-found: error
+  arm:
+    name: Ubuntu arm
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: ${{ inputs.repository || github.repository }}
+          ref: ${{ inputs.ref }}
+          submodules: recursive
+      - name: Package and test application in container
+        uses: shiftkey/desktop-ubuntu-arm-packaging@48215eee48762e1c919309b2915b8ceb478e5642
+      - name: Upload output artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ubuntu-arm-artifacts
+          path: |
+            dist/*.AppImage
+            dist/*.deb
+            dist/*.rpm
+            dist/*.sha256
+          retention-days: 5
+          if-no-files-found: error
+  amd64:
+    name: Ubuntu x64
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: ${{ inputs.repository || github.repository }}
+          ref: ${{ inputs.ref }}
+          submodules: recursive
+      - name: Package and test application in container
+        uses: shiftkey/desktop-ubuntu-amd64-packaging@33a71a92b43e54694726382d1e4029a91fe894cc
+      - name: Upload output artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ubuntu-amd64-artifacts
+          path: |
+            dist/*.AppImage
+            dist/*.deb
+            dist/*.rpm
+            dist/*.sha256
+          retention-days: 5
+          if-no-files-found: error
+
+  publish:
+    name: Create GitHub release
+    needs: [arm64, arm, amd64]
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/')
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Use Node.js 20.17.0
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.17.0
+          cache: yarn
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: './artifacts'
+
+      - name: Display structure of downloaded files
+        run: ls -R
+        working-directory: './artifacts'
+
+      - name: Get tag name without prefix
+        run: |
+          RELEASE_TAG=${GITHUB_REF/refs\/tags\//}
+          echo "RELEASE_TAG=${RELEASE_TAG}" >> $GITHUB_ENV
+          tagNameWithoutPrefix="${RELEASE_TAG:8}"
+          echo "RELEASE_TAG_WITHOUT_PREFIX=${tagNameWithoutPrefix}" >> $GITHUB_ENV
+
+      # TODO: generate release notes
+      #    - pull in default if version matches X.Y.Z-linux1
+      #    - otherwise stub template
+
+      - name: Generate release notes
+        run: |
+          node -v
+          yarn
+          node -r ts-node/register script/generate-release-notes.ts "${{ github.workspace }}/artifacts" "${{ env.RELEASE_TAG_WITHOUT_PREFIX }}"
+          RELEASE_NOTES_FILE=script/release_notes.txt
+          if [[ ! -f "$RELEASE_NOTES_FILE" ]]; then
+              echo "$RELEASE_NOTES_FILE does not exist. Something might have gone wrong while generating the release notes."
+              exit 1
+          fi
+          echo "Release notes:"
+          echo "---"
+          cat ${RELEASE_NOTES_FILE}
+          echo "---"
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        with:
+          name: GitHub Desktop for Linux ${{ env.RELEASE_TAG_WITHOUT_PREFIX }}
+          body_path: script/release_notes.txt
+          files: |
+            artifacts/**/*.AppImage
+            artifacts/**/*.deb
+            artifacts/**/*.rpm
+            artifacts/**/*.sha256
+          draft: true
+          fail_on_unmatched_files: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

@@ -4,7 +4,14 @@ on:
   push:
     branches:
       - development
+      - linux
+      - 'linux-release-*'
+    tags:
+      - 'release-*.*.*-linux*'
   pull_request:
+    branches:
+      - linux
+      - 'linux-release-*'
   workflow_call:
     inputs:
       repository:
@@ -70,10 +77,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13-xl-arm64, windows-2019]
+        os: [macos-13, windows-2019]
         arch: [x64, arm64]
         include:
-          - os: macos-13-xl-arm64
+          - os: macos-13
             friendlyName: macOS
           - os: windows-2019
             friendlyName: Windows

.github/workflows/codeql.yml

@@ -2,7 +2,7 @@ name: 'Code scanning - action'
 
 on:
   push:
-    branches: ['development']
+    branches: ['development', 'linux']
   pull_request:
     branches: ['development']
   schedule:

.github/workflows/create-draft-release.yml

@@ -0,0 +1,74 @@
+name: 'Create draft release from upstream'
+
+on:
+  workflow_dispatch:
+    inputs:
+      release:
+        description: 'Upstream release'
+        required: true
+        type: string
+      publish:
+        description: 'Whether to publish the release to GitHub on success'
+        type: boolean
+        required: false
+        default: false
+
+jobs:
+  publish-draft-release:
+    runs-on: ubuntu-latest
+    name: Publish draft release
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.CREATE_RELEASE_AUTOMATION_TOKEN }}
+      - name: Configure git
+        run: |
+          git config --global user.name "shiftbot"
+          git config --global user.email "github@brendanforster.com"
+          git config --local core.autocrlf "input"
+          git remote add upstream https://github.com/desktop/desktop.git
+        shell: bash
+      - name: Create baseline branch on fork
+        id: create-baseline-branch
+        env:
+          RELEASE_TAG: ${{ inputs.release }}
+          BASE_BRANCH: 'linux-${{ inputs.release }}'
+        run: |
+          git fetch upstream 'refs/tags/*:refs/tags/*'
+          git fetch origin --unshallow
+          git checkout -b $BASE_BRANCH $RELEASE_TAG
+          git push origin $BASE_BRANCH
+          git config -l --show-origin
+        shell: bash
+      - name: Rebase Linux customizations on top of upstream release branch
+        id: rebase-linux-branch
+        env:
+          HEAD_BRANCH: 'apply-changes-${{ inputs.release }}'
+          BASE_BRANCH: 'linux-${{ inputs.release }}'
+          UPSTREAM_BRANCH: 'development'
+        run: |
+
+          git fetch origin linux
+          git fetch origin $UPSTREAM_BRANCH
+          git checkout -b $HEAD_BRANCH linux
+          git push origin $HEAD_BRANCH
+          git submodule update
+          echo "One last git config output..."
+          git config -l --show-origin
+          echo "Commit identifiers before performing rebase..."
+          echo "BASE_BRANCH: $(git rev-parse $BASE_BRANCH)"
+          echo "development: $(git rev-parse origin/$UPSTREAM_BRANCH)"
+          echo "HEAD_BRANCH: $(git rev-parse $HEAD_BRANCH)"
+          echo "About to run 'git log --oneline --decorate=full --graph $HEAD_BRANCH...origin/$UPSTREAM_BRANCH'..."
+          git log --oneline --decorate=full --graph $HEAD_BRANCH...origin/$UPSTREAM_BRANCH
+          echo "About to run 'git rebase --verbose origin/$UPSTREAM_BRANCH $HEAD_BRANCH --onto $BASE_BRANCH'..."
+          git rebase --verbose origin/$UPSTREAM_BRANCH $HEAD_BRANCH --onto $BASE_BRANCH
+          git push origin $HEAD_BRANCH
+        shell: bash
+        continue-on-error: true
+      - name: Review current status
+        id: status
+        run: |
+          git status
+        shell: bash

.github/workflows/pr-is-external.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   label_issues:
     # pull_request.head.label = {owner}:{branch}
-    if: startsWith(github.event.pull_request.head.label, 'desktop:') == false
+    if: startsWith(github.event.pull_request.head.label, 'shiftkey:') == false
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write

.github/workflows/release-pr.yml

@@ -37,7 +37,7 @@ jobs:
           private_key: ${{ secrets.DESKTOP_RELEASES_APP_PRIVATE_KEY }}
 
       - name: Create Release Pull Request
-        uses: peter-evans/create-pull-request@v6.0.5
+        uses: peter-evans/create-pull-request@v7.0.6
         if: |
           startsWith(github.ref, 'refs/heads/releases/') && !contains(github.ref, 'test')
         with:

.github/workflows/sync-with-upstream.yml

@@ -0,0 +1,43 @@
+name: 'Sync main branch with upstream'
+
+on: workflow_dispatch
+
+jobs:
+  sync-with-upstream:
+    runs-on: ubuntu-latest
+    name: Sync main branch with upstream
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.CREATE_RELEASE_AUTOMATION_TOKEN }}
+      - name: Configure git
+        run: |
+          git config --global user.name "shiftbot"
+          git config --global user.email "github@brendanforster.com"
+          git remote add upstream https://github.com/desktop/desktop.git
+        shell: bash
+      - name: Push development changes from upstream to fork
+        id: sync-development-branch
+        run: |
+          git fetch upstream development
+          git fetch origin --unshallow
+          git fetch origin development
+          git checkout -b development upstream/development
+          git push origin development
+        shell: bash
+      - name: Rebase Linux customizations on top of development branch
+        id: rebase-linux-branch
+        run: |
+          git fetch origin linux
+          git checkout linux
+          git log linux...development --oneline
+          git rebase --verbose development linux
+        shell: bash
+        continue-on-error: true
+      - name: Review current status
+        id: status
+        run: |
+          git status
+        shell: bash
+        # TODO: force push this when we're confident that the rebase has succeeded?

.gitignore

@@ -17,3 +17,4 @@ vendor/windows-argv-parser/build/
 junit*.xml
 *.swp
 tslint-rules/
+script/release_notes.txt