Skip to content

Commit b832f25

Browse files
authored
Merge pull request #487 from madsmtm/update-xcode-nightly
Update to Xcode 14.3, and update rustc nightly
2 parents dd5bec7 + f45c33d commit b832f25

File tree

63 files changed

+802
-724
lines changed

Some content is hidden

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

63 files changed

+802
-724
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ env:
4444
--package=objc2-encode
4545
--package=objc2-proc-macros
4646
# The current nightly Rust version that our CI uses
47-
CURRENT_NIGHTLY: nightly-2023-05-25
47+
CURRENT_NIGHTLY: nightly-2023-08-27
4848
# Various features that we'd usually want to test with
4949
#
5050
# Note: The `exception` feature is not enabled here, since it requires
@@ -148,7 +148,8 @@ jobs:
148148
run: cargo doc --no-deps --document-private-items ${{ matrix.args }}
149149

150150
- name: cargo clippy
151-
run: cargo clippy --all-targets ${{ matrix.args }}
151+
# Temporarily allow diverging_sub_expression until we figure out how to silence them in declare_class!
152+
run: cargo clippy --all-targets ${{ matrix.args }} -- --allow=clippy::diverging_sub_expression
152153

153154
msrv:
154155
name: Check MSRV
@@ -215,6 +216,9 @@ jobs:
215216
- fmt
216217
- lint
217218

219+
env:
220+
TEST_OVERWRITE: 1
221+
218222
steps:
219223
- uses: actions/checkout@v3
220224
with:
@@ -226,41 +230,32 @@ jobs:
226230
toolchain: ${{ env.CURRENT_NIGHTLY }}
227231
components: rust-src
228232

229-
- name: Install remaining targets
230-
run: >-
231-
rustup target add
232-
x86_64-apple-darwin
233-
aarch64-apple-darwin
234-
x86_64-unknown-linux-gnu
235-
i686-unknown-linux-gnu
236-
237233
- name: Cache Cargo
238234
uses: actions/cache@v3
239235
with:
240236
path: ${{ env.CARGO_CACHE_PATH }}
241237
key: cargo-${{ github.job }}-${{ matrix.name }}-${{ hashFiles('**/Cargo.lock') }}
242238

243239
- name: Run macOS x86_64 assembly tests
244-
run: cargo run --bin=test-assembly -- --target=x86_64-apple-darwin
240+
run: cargo run --bin=test-assembly -- -Z build-std --target=x86_64-apple-darwin
245241

246242
- name: Run all assembly tests
247243
if: ${{ env.FULL }}
248244
run: ./helper-scripts/run-assembly-tests.sh
249-
env:
250-
TEST_OVERWRITE: 1
251245

252246
- name: Check diff
247+
if: ${{ always() }}
253248
run: git diff --exit-code
254249

255250
header-translator:
256251
name: Verify header translator output
257-
runs-on: macos-12
252+
runs-on: macos-13
258253
needs:
259254
- fmt
260255
- lint
261256

262257
env:
263-
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
258+
DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
264259

265260
steps:
266261
- uses: actions/checkout@v3

Cargo.lock

Lines changed: 67 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)