Skip to content

Commit

Permalink
Merge pull request #551 from madsmtm/block-sys-refactor
Browse files Browse the repository at this point in the history
Merge `block-sys` into `block2`
  • Loading branch information
madsmtm authored Jan 7, 2024
2 parents cf65007 + 056e578 commit 42bcda9
Show file tree
Hide file tree
Showing 22 changed files with 436 additions and 611 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ env:
#
# This excludes `header-translator`, `test-assembly`, `tests` and `test-ui`.
PUBLIC_CRATES: >-
--package=block-sys
--package=block2
--package=icrate
--package=objc-sys
Expand Down Expand Up @@ -780,10 +779,8 @@ jobs:
- lint

env:
# `compiler-rt` is only relevant for these crates
PUBLIC_CRATES: >-
--package=block-sys
--package=block2
# `compiler-rt` is only relevant for block2
PUBLIC_CRATES: --package=block2

steps:
- uses: actions/checkout@v3
Expand Down
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ Copy and fill out the following checklist into the release PR:
- `objc2-proc-macros`
- `objc-sys`
- `objc2-encode`
- `block-sys`
- `objc2`
- `block2`
- `icrate`
Expand Down
9 changes: 0 additions & 9 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

70 changes: 0 additions & 70 deletions crates/block-sys/CHANGELOG.md

This file was deleted.

84 changes: 0 additions & 84 deletions crates/block-sys/Cargo.toml

This file was deleted.

119 changes: 0 additions & 119 deletions crates/block-sys/README.md

This file was deleted.

Loading

0 comments on commit 42bcda9

Please sign in to comment.