Upstream merge

.github/actions/setup-ci-environment/action.yml

@@ -0,0 +1,39 @@
+name: Setup CI Environment
+description: Set up Python, Node.js, optional ffmpeg, and install dependencies.
+
+inputs:
+  node-version:
+    description: Node.js version to use.
+    required: true
+  arch:
+    description: Target architecture for dependency installation.
+    required: true
+  install-ffmpeg:
+    description: Whether to install ffmpeg on Windows.
+    required: false
+    default: 'false'
+
+runs:
+  using: composite
+  steps:
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.11'
+
+    - name: Use Node.js ${{ inputs.node-version }}
+      uses: actions/setup-node@v4
+      with:
+        node-version: ${{ inputs.node-version }}
+        cache: yarn
+
+    - name: Install ffmpeg
+      if: ${{ runner.os == 'Windows' && inputs.install-ffmpeg == 'true' }}
+      shell: bash
+      run: choco install ffmpeg --yes --no-progress
+
+    - name: Install and build dependencies
+      shell: bash
+      run: yarn
+      env:
+        npm_config_arch: ${{ inputs.arch }}
+        TARGET_ARCH: ${{ inputs.arch }}

.github/actions/setup-windows-signing/action.yml

@@ -0,0 +1,35 @@
+name: Setup Windows Signing
+description: Install Azure Code Signing prerequisites and authenticate.
+
+inputs:
+  enabled:
+    description: Whether Windows signing setup should run.
+    required: false
+    default: 'false'
+  azure-client-id:
+    description: Azure Code Signing client ID.
+    required: false
+  azure-tenant-id:
+    description: Azure Code Signing tenant ID.
+    required: false
+
+runs:
+  using: composite
+  steps:
+    - name: Install Azure Code Signing Client
+      if: ${{ runner.os == 'Windows' && inputs.enabled == 'true' }}
+      shell: pwsh
+      run: |
+        $acsZip = Join-Path $env:RUNNER_TEMP "acs.zip"
+        $acsDir = Join-Path $env:RUNNER_TEMP "acs"
+        Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Trusted.Signing.Client/1.0.95 -OutFile $acsZip -Verbose
+        Expand-Archive $acsZip -Destination $acsDir -Force -Verbose
+        Copy-Item -Path "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\*" -Include signtool.exe,signtool.exe.manifest,Microsoft.Windows.Build.Signing.mssign32.dll.manifest,mssign32.dll,Microsoft.Windows.Build.Signing.wintrust.dll.manifest,wintrust.dll,Microsoft.Windows.Build.Appx.AppxSip.dll.manifest,AppxSip.dll,Microsoft.Windows.Build.Appx.AppxPackaging.dll.manifest,AppxPackaging.dll,Microsoft.Windows.Build.Appx.OpcServices.dll.manifest,OpcServices.dll -Destination "node_modules\electron-winstaller\vendor" -Verbose
+
+    - name: Azure Login (OIDC)
+      if: ${{ runner.os == 'Windows' && inputs.enabled == 'true' }}
+      uses: azure/login@v2
+      with:
+        client-id: ${{ inputs.azure-client-id }}
+        tenant-id: ${{ inputs.azure-tenant-id }}
+        allow-no-subscriptions: true

.github/workflows/ci.yml

@@ -137,19 +137,10 @@ jobs:
           repository: ${{ inputs.repository || github.repository }}
           ref: ${{ inputs.ref }}
           submodules: recursive
-      - uses: actions/setup-python@v6
-        with:
-          python-version: '3.11'
-      - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v6
+      - uses: ./.github/actions/setup-ci-environment
         with:
           node-version: ${{ env.NODE_VERSION }}
-          cache: yarn
-      - name: Install and build dependencies
-        run: yarn
-        env:
-          npm_config_arch: ${{ matrix.arch }}
-          TARGET_ARCH: ${{ matrix.arch }}
+          arch: ${{ matrix.arch }}
       - name: Validate macOS version
         if: runner.os == 'macOS'
         run: yarn validate-macos-version
@@ -189,22 +180,12 @@ jobs:
         run: yarn test:unit
       - name: Run script tests
         run: yarn test:script
-      - name: Install Azure Code Signing Client
-        if: ${{ runner.os == 'Windows' }}
-        run: |
-          $acsZip = Join-Path $env:RUNNER_TEMP "acs.zip"
-          $acsDir = Join-Path $env:RUNNER_TEMP "acs"
-          Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Trusted.Signing.Client/1.0.95 -OutFile $acsZip -Verbose
-          Expand-Archive $acsZip -Destination $acsDir -Force -Verbose
-          # Replace ancient signtool in electron-winstall with one that supports ACS
-          Copy-Item -Path "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\*" -Include signtool.exe,signtool.exe.manifest,Microsoft.Windows.Build.Signing.mssign32.dll.manifest,mssign32.dll,Microsoft.Windows.Build.Signing.wintrust.dll.manifest,wintrust.dll,Microsoft.Windows.Build.Appx.AppxSip.dll.manifest,AppxSip.dll,Microsoft.Windows.Build.Appx.AppxPackaging.dll.manifest,AppxPackaging.dll,Microsoft.Windows.Build.Appx.OpcServices.dll.manifest,OpcServices.dll -Destination "node_modules\electron-winstaller\vendor" -Verbose
-      - name: Azure Login (OIDC)
-        if: ${{ runner.os == 'Windows' && inputs.sign }}
-        uses: azure/login@v2
+      - if: runner.os == 'Windows'
+        uses: ./.github/actions/setup-windows-signing
         with:
-          client-id: ${{ secrets.AZURE_CODE_SIGNING_CLIENT_ID }}
-          tenant-id: ${{ secrets.AZURE_CODE_SIGNING_TENANT_ID }}
-          allow-no-subscriptions: true
+          enabled: ${{ inputs.sign }}
+          azure-client-id: ${{ secrets.AZURE_CODE_SIGNING_CLIENT_ID }}
+          azure-tenant-id: ${{ secrets.AZURE_CODE_SIGNING_TENANT_ID }}
       - name: Package production app
         run: yarn package
         env:
@@ -233,6 +214,137 @@ jobs:
             dist/bundle-size.json
           if-no-files-found: error
 
+  e2e-smoke:
+    name: E2E Smoke ${{ matrix.friendlyName }} ${{ matrix.arch }}
+    runs-on: ${{ matrix.os }}
+    permissions:
+      contents: read
+      id-token: write
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: macos-14
+            friendlyName: macOS
+            arch: arm64
+          - os: windows-2022
+            friendlyName: Windows
+            arch: x64
+    timeout-minutes: 60
+    environment: ${{ inputs.environment }}
+    env:
+      RELEASE_CHANNEL: ${{ inputs.environment }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: ${{ inputs.repository || github.repository }}
+          ref: ${{ inputs.ref }}
+          submodules: recursive
+      - uses: ./.github/actions/setup-ci-environment
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          arch: ${{ matrix.arch }}
+          install-ffmpeg: 'true'
+      - name: Build production app
+        run: yarn build:prod
+        env:
+          DESKTOP_E2E_UPDATES_URL: http://127.0.0.1:51789/update
+          DESKTOP_OAUTH_CLIENT_ID: ${{ secrets.DESKTOP_OAUTH_CLIENT_ID }}
+          DESKTOP_OAUTH_CLIENT_SECRET:
+            ${{ secrets.DESKTOP_OAUTH_CLIENT_SECRET }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          APPLE_APPLICATION_CERT: ${{ secrets.APPLE_APPLICATION_CERT }}
+          KEY_PASSWORD: ${{ secrets.APPLE_APPLICATION_CERT_PASSWORD }}
+          npm_config_arch: ${{ matrix.arch }}
+          TARGET_ARCH: ${{ matrix.arch }}
+      - name: Prepare testing environment
+        run: yarn test:setup
+        env:
+          npm_config_arch: ${{ matrix.arch }}
+      - if: runner.os == 'Windows'
+        uses: ./.github/actions/setup-windows-signing
+        with:
+          enabled: ${{ inputs.sign }}
+          azure-client-id: ${{ secrets.AZURE_CODE_SIGNING_CLIENT_ID }}
+          azure-tenant-id: ${{ secrets.AZURE_CODE_SIGNING_TENANT_ID }}
+      - name: Package production app
+        run: yarn package
+        env:
+          npm_config_arch: ${{ matrix.arch }}
+          AZURE_TENANT_ID: ${{ secrets.AZURE_CODE_SIGNING_TENANT_ID }}
+          AZURE_CLIENT_ID: ${{ secrets.AZURE_CODE_SIGNING_CLIENT_ID }}
+      - name: Install app on macOS
+        if: runner.os == 'macOS'
+        run: |
+          rm -rf "/Applications/GitHub Desktop Plus.app"
+          ditto "dist/GitHub Desktop Plus-darwin-arm64/GitHub Desktop Plus.app" "/Applications/GitHub Desktop Plus.app"
+          echo "DESKTOP_E2E_APP_PATH=/Applications/GitHub Desktop Plus.app/Contents/MacOS/GitHub Desktop Plus" >> "$GITHUB_ENV"
+      - name: Install app on Windows
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          function Write-SquirrelLogs {
+            $logPaths = @(
+              "$env:LOCALAPPDATA\SquirrelSetup.log",
+              "$env:LOCALAPPDATA\GitHubDesktopPlus\SquirrelSetup.log"
+            )
+
+            foreach ($logPath in $logPaths) {
+              if (Test-Path $logPath) {
+                Write-Host "Showing log: $logPath"
+                Get-Content $logPath -Tail 200
+              }
+            }
+          }
+
+          $setupExe = Get-ChildItem "dist/GitHubDesktopPlus-*-windows-${{ matrix.arch }}.exe" -ErrorAction SilentlyContinue |
+            Sort-Object FullName -Descending |
+            Select-Object -First 1 -ExpandProperty FullName
+
+          if (-not $setupExe) {
+            throw "Unable to locate Windows installer executable"
+          }
+
+          $installer = Start-Process -FilePath $setupExe -ArgumentList "/S" -PassThru
+
+          try {
+            Wait-Process -Id $installer.Id -Timeout 300 -ErrorAction Stop
+          } catch {
+            Write-SquirrelLogs
+            throw "Windows installer timed out after 300 seconds"
+          }
+
+          Get-Process GitHubDesktopPlus -ErrorAction SilentlyContinue | Stop-Process -Force
+
+          $installedExe = $null
+          for ($attempt = 0; $attempt -lt 30 -and -not $installedExe; $attempt++) {
+            $installedExe = Get-ChildItem "$env:LOCALAPPDATA\GitHubDesktopPlus\app-*\GitHubDesktopPlus.exe" -ErrorAction SilentlyContinue |
+              Sort-Object FullName -Descending |
+              Select-Object -First 1 -ExpandProperty FullName
+
+            if (-not $installedExe) {
+              Start-Sleep -Seconds 2
+            }
+          }
+
+          if (-not $installedExe) {
+            Write-SquirrelLogs
+            throw "Unable to locate installed GitHub Desktop executable"
+          }
+
+          Add-Content -Path $env:GITHUB_ENV -Value "DESKTOP_E2E_APP_PATH=$installedExe"
+      - name: Run packaged E2E smoke tests
+        run: yarn test:e2e:run:packaged
+      - name: Upload E2E artifacts
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: e2e-${{matrix.friendlyName}}-${{matrix.arch}}
+          path: playwright-videos/**
+          if-no-files-found: warn
+
   release_github:
     name: Create GitHub release
     needs: [build, compute_version]

.gitignore

@@ -20,3 +20,4 @@ junit*.xml
 *.swp
 tslint-rules/
 script/release_notes.txt
+playwright-videos/

app/app-info.ts

@@ -46,7 +46,7 @@ export function getReplacements() {
     __DEV__: isDevBuild,
     __DEV_SECRETS__: isDevBuild || !process.env.DESKTOP_OAUTH_CLIENT_SECRET,
     __RELEASE_CHANNEL__: s(channel),
-    __UPDATES_URL__: s(getUpdatesURL()),
+    __UPDATES_URL__: s(process.env.DESKTOP_E2E_UPDATES_URL ?? getUpdatesURL()),
     __SHA__: s(getSHA()),
     'process.platform': s(process.platform),
     'process.env.NODE_ENV': s(process.env.NODE_ENV || 'development'),

app/src/ui/app.tsx

@@ -1563,6 +1563,8 @@ export class App extends React.Component<IAppProps, IAppState> {
             dispatcher={this.props.dispatcher}
             repository={popup.repository}
             branch={popup.branch}
+            accounts={this.state.accounts}
+            cachedRepoRulesets={this.state.cachedRepoRulesets}
             onDismissed={onPopupDismissedFn}
           />
         )

app/src/ui/branches/branch-list.tsx

@@ -373,7 +373,7 @@ export class BranchList extends React.Component<IBranchListProps> {
 
   private onRenderNewButton = () => {
     return this.props.canCreateNewBranch ? (
-      <Button onClick={this.onCreateNewBranch}>
+      <Button className="new-branch-button" onClick={this.onCreateNewBranch}>
         <Octicon symbol={octicons.plus} className="mr" />
         {__DARWIN__ ? 'New Branch' : 'New branch'}
       </Button>