Includes prior-session patches (carry forward so the app compiles): - crates/gpui/build.rs: cross-compile manifest fix - crates/gpui/src/platform.rs: PlatformWindow::activate_with_token trait method - crates/gpui/src/window.rs: Window::activate_with_token public API - crates/gpui_linux/src/linux/wayland/window.rs: WaylandWindow::activate_with_token + activate() keyboard-serial fix Plus the focus-serial fix: - serial.rs: SerialKind::KeyboardEnter - client.rs: store wl_keyboard.enter serial; latest_serial_of() Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
55 lines
1.7 KiB
YAML
55 lines
1.7 KiB
YAML
# Generated from xtask::workflows::cherry_pick
|
|
# Rebuild with `cargo xtask workflows`.
|
|
name: cherry_pick
|
|
run-name: 'cherry_pick to ${{ inputs.channel }} #${{ inputs.pr_number }}'
|
|
on:
|
|
workflow_dispatch:
|
|
inputs:
|
|
commit:
|
|
description: commit
|
|
required: true
|
|
type: string
|
|
branch:
|
|
description: branch
|
|
required: true
|
|
type: string
|
|
channel:
|
|
description: channel
|
|
required: true
|
|
type: string
|
|
pr_number:
|
|
description: pr_number
|
|
required: true
|
|
type: string
|
|
jobs:
|
|
run_cherry_pick:
|
|
runs-on: namespace-profile-2x4-ubuntu-2404
|
|
steps:
|
|
- name: steps::checkout_repo
|
|
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
|
|
with:
|
|
clean: false
|
|
- id: generate-token
|
|
name: steps::authenticate_as_zippy
|
|
uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859
|
|
with:
|
|
app-id: ${{ secrets.ZED_ZIPPY_APP_ID }}
|
|
private-key: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
|
|
permission-contents: write
|
|
permission-workflows: write
|
|
permission-pull-requests: write
|
|
- name: cherry_pick::run_cherry_pick::cherry_pick
|
|
run: ./script/cherry-pick "$BRANCH" "$COMMIT" "$CHANNEL"
|
|
env:
|
|
BRANCH: ${{ inputs.branch }}
|
|
COMMIT: ${{ inputs.commit }}
|
|
CHANNEL: ${{ inputs.channel }}
|
|
GIT_AUTHOR_NAME: zed-zippy[bot]
|
|
GIT_AUTHOR_EMAIL: <234243425+zed-zippy[bot]@users.noreply.github.com>
|
|
GIT_COMMITTER_NAME: zed-zippy[bot]
|
|
GIT_COMMITTER_EMAIL: <234243425+zed-zippy[bot]@users.noreply.github.com>
|
|
GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
|
|
defaults:
|
|
run:
|
|
shell: bash -euxo pipefail {0}
|