Skip to content

Commit 9c9826a

Browse files
committed
Merge branch 'master' into link_feat
# Conflicts: # cocoa-foundation/src/foundation.rs # cocoa/src/appkit.rs # cocoa/src/quartzcore.rs # core-graphics-types/src/geometry.rs # core-graphics/src/color.rs # core-graphics/src/color_space.rs # core-graphics/src/context.rs # core-graphics/src/data_provider.rs # core-graphics/src/event.rs # core-graphics/src/event_source.rs # core-graphics/src/font.rs # core-graphics/src/gradient.rs # core-graphics/src/image.rs # core-graphics/src/path.rs # core-graphics/src/private.rs # core-graphics/src/window.rs # core-text/src/font.rs # core-text/src/frame.rs # core-text/src/line.rs # core-text/src/run.rs # io-surface/src/lib.rs
2 parents 6ad977d + fbde503 commit 9c9826a

File tree

119 files changed

+6287
-4559
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+6287
-4559
lines changed

.github/workflows/rust.yml

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,53 @@ name: Rust
22

33
on:
44
push:
5-
branches: ["**"]
5+
branches: [master]
66
pull_request:
77
branches: ["**"]
8+
merge_group:
9+
types: [checks_requested]
810

911
env:
1012
CARGO_TERM_COLOR: always
1113

1214
jobs:
15+
rustfmt:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/checkout@v3
19+
- uses: dtolnay/rust-toolchain@master
20+
with:
21+
toolchain: stable
22+
components: rustfmt
23+
- run: cargo fmt --check
1324
semver:
1425
runs-on: macos-11.0
1526
steps:
16-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v3
1728
- name: Check semver
1829
uses: obi1kenobi/cargo-semver-checks-action@v2
1930
build:
2031
runs-on: ${{ matrix.os }}
2132
strategy:
2233
matrix:
2334
os: [macos-11.0, macos-12, macos-13]
35+
toolchain: [stable, 1.56.1]
2436
steps:
25-
- uses: actions/checkout@v2
37+
- uses: actions/checkout@v3
38+
- name: Install toolchain
39+
uses: dtolnay/rust-toolchain@master
40+
with:
41+
toolchain: ${{ matrix.toolchain }}
2642
- name: Build
2743
run: cargo build --verbose
2844
- name: Run tests
2945
run: cargo test --verbose
3046
build_result:
31-
name: homu build finished
47+
name: Result
3248
runs-on: ubuntu-latest
3349
needs:
3450
- "build"
51+
- "semver"
3552
steps:
3653
- name: Mark the job as successful
3754
run: exit 0

cocoa-foundation/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name = "cocoa-foundation"
44
description = "Bindings to Cocoa Foundation for macOS"
55
homepage = "https://github.com/servo/core-foundation-rs"
66
repository = "https://github.com/servo/core-foundation-rs"
7-
version = "0.1.1"
7+
version = "0.1.2"
88
authors = ["The Servo Project Developers"]
99
license = "MIT OR Apache-2.0"
1010

cocoa-foundation/LICENSE-APACHE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../LICENSE-APACHE

cocoa-foundation/LICENSE-MIT

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../LICENSE-MIT

0 commit comments

Comments
 (0)