Skip to content

Commit

Permalink
Merge branch 'master' of github.com:alacritty/alacritty
Browse files Browse the repository at this point in the history
  • Loading branch information
ezhang7423 committed Jun 14, 2022
2 parents 7f4ceee + d9c6c8d commit ce29942
Show file tree
Hide file tree
Showing 118 changed files with 5,953 additions and 2,515 deletions.
4 changes: 2 additions & 2 deletions .builds/freebsd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ tasks:
cargo clippy --all-targets
- feature-wayland: |
cd alacritty/alacritty
cargo test --no-default-features --features=wayland
RUSTFLAGS="-D warnings" cargo test --no-default-features --features=wayland
- feature-x11: |
cd alacritty/alacritty
cargo test --no-default-features --features=x11
RUSTFLAGS="-D warnings" cargo test --no-default-features --features=x11
4 changes: 2 additions & 2 deletions .builds/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ tasks:
cargo clippy --all-targets
- feature-wayland: |
cd alacritty/alacritty
cargo test --no-default-features --features=wayland
RUSTFLAGS="-D warnings" cargo test --no-default-features --features=wayland
- feature-x11: |
cd alacritty/alacritty
cargo test --no-default-features --features=x11
RUSTFLAGS="-D warnings" cargo test --no-default-features --features=x11
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ jobs:
- uses: actions/checkout@v2
- name: Install target
run: rustup update && rustup target add aarch64-apple-darwin
- name: Check build
run: cargo check --target=aarch64-apple-darwin
- name: Build
run: cargo build --target=aarch64-apple-darwin
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
run: rustup update && rustup target add aarch64-apple-darwin
- name: Test
run: cargo test --release
- name: Test ARM
run: cargo test --release --target=aarch64-apple-darwin
- name: Build ARM
run: cargo build --release --target=aarch64-apple-darwin
- name: Make DMG
run: make dmg-universal
- name: Upload Application
Expand Down
56 changes: 56 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,57 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

- Minimum Rust version has been bumped to 1.56.0

### Added

- Track and report surface damage information to Wayland compositors
- Escape sequence for undercurl, dotted and dashed underlines (`CSI 4 : [3-5] m`)
- `ToggleMaximized` key binding action to (un-)maximize the active window, not bound by default
- Support for OpenGL ES 2.0
- Escape sequence to set underline color (`CSI 58 : 2 : Ps : Ps : Ps m`/`CSI 58 : 5 : Ps m`)
- Escape sequence to reset underline color (`CSI 59 m`)
- Vi mode keybinding (z) to center view around vi mode cursor

### Changed

- The `--help` output was reworked with a new colorful syntax
- OSC 52 is now disabled on unfocused windows
- `SpawnNewInstance` no longer inherits initial `--command`

### Fixed

- Creating the IPC socket failing if WAYLAND_DISPLAY contains an absolute path
- Crash when resetting the terminal while in vi mode
- `font.glyph_offset` not live reloading
- Failure when running on 10-bit color system
- The colors being slightly different when using srgb displays on macOS
- Vi cursor blinking not reset when navigating in search
- Scrolling and middle-clicking modifying the primary selection
- Bottom gap for certain builtin box drawing characters
- Incorrect built-in glyphs for `U+2567` and `U+2568`
- Character mappings in the DEC special graphics character set (line drawing)
- Window flickering on resize on Wayland

## 0.10.1

### Added

- Option `font.builtin_box_drawing` to disable the built-in font for drawing box characters

### Changed

- Builtin font thickness is now based on cell width instead of underline thickness

### Fixed

- OSC 4 not handling `?`
- `?` in OSC strings reporting default colors instead of modified ones
- OSC 104 not clearing colors when second parameter is empty
- Builtin font lines not contiguous when `font.offset` is used
- `font.glyph_offset` is no longer applied on builtin font
- Buili-in font arcs alignment
- Repeated permission prompts on M1 macs
- Colors being slightly off when using `colors.transparent_background_colors`

## 0.10.0

### Packaging
Expand All @@ -32,6 +83,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Strip trailing whitespaces when yanking from a block selection
- Display area keeps history position when viewport is cleared
- Commands spawn from the current directory of the foreground shell in Unix-like systems
- Remove trailing newline from strings taken from hints or simple/semantic selections
- Builtin font is now used for box drawing characters from `U+2500` to `U+259f`
- Logs now print the time since startup instead of the local time

### Fixed

Expand All @@ -43,6 +97,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Freeze when the vi cursor is on the scrollback and scrollback clear is invoked
- Vi cursor on topmost of the display moving downward when scrolled into history with active output
- Input lag on Wayland with Nvidia binary driver
- Crash when hovering the mouse over fullwidth characters
- Do not create logfile if the file already exists

### Removed

Expand Down
21 changes: 11 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,17 +124,18 @@ The exact steps for an exemplary `0.2.0` release might look like this:
2. A new `v0.2.0` branch is created for the release
3. In the branch, the version is bumped to `0.2.0-rc1`
4. The new commit in the branch is tagged as `v0.2.0-rc1`
5. A GitHub release is created for the `v0.2.0-rc1` tag
6. The changelog since the last release (stable or RC) is added to the GitHub release description
7. On master, the version is bumped to `0.3.0-dev`
5. The pre-release versions are published to crates.io
6. A GitHub release is created for the `v0.2.0-rc1` tag
7. The changelog since the last release (stable or RC) is added to the GitHub release description
8. On master, the version is bumped to `0.3.0-dev`
and the `-dev` suffix is removed from the `0.2.0-dev` changelog
8. Bug fixes are cherry-picked from master into the branch and steps 4-7 are repeated until no
9. Bug fixes are cherry-picked from master into the branch and steps 3-7 are repeated until no
major issues are found in the release candidates
9. In the branch, the version is bumped to `0.2.0`
10. The new commit in the branch is tagged as `v0.2.0`
11. The new version is published to crates.io
12. A GitHub release is created for the `v0.2.0` tag
13. The changelog since the last stable release (**not** RC) is added to the GitHub release
10. In the branch, the version is bumped to `0.2.0`
11. The new commit in the branch is tagged as `v0.2.0`
12. The new version is published to crates.io
13. A GitHub release is created for the `v0.2.0` tag
14. The changelog since the last stable release (**not** RC) is added to the GitHub release
description

On master and with new planned releases, only the minor version is bumped. This makes it possible to
Expand All @@ -146,7 +147,7 @@ The exact steps for an exemplary `0.2.3` release might look like this:
2. A new `v0.2.3` branch is forked from the `v0.2.2` branch
4. All bug fixes are cherry-picked from master into the `v0.2.3` branch
5. The version is bumped to `v0.2.3-rc1` and the changelog is updated to include all fixes
6. Follow Steps 5-12 of the regular release's example
6. Follow Steps 4-13 of the regular release's example
7. The release's changelog is ported back to master, removing fixes from the `0.2.3` release

The `alacritty_terminal` crate is released in synchronization with `alacritty`, keeping the `-dev`
Expand Down
Loading

0 comments on commit ce29942

Please sign in to comment.