From 1b3a530fb76c34be44dad933c2f390c0c9b06457 Mon Sep 17 00:00:00 2001
From: msga-mmm <109926431+msga-mmm@users.noreply.github.com>
Date: Sun, 5 May 2024 03:16:13 -0500
Subject: [PATCH] fix(github-actions): use rust toolchain arm64 version for
 macos 14 (#355)

* fix(osx): use rust toolchain arm version for macos 14

* feat(ntex-bytes): remove conflicting serde feature flag
---
 .github/workflows/osx.yml      | 8 ++++----
 ntex-bytes/tests/test_serde.rs | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
index 40d90c89..9ba3e9f8 100644
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@@ -11,7 +11,7 @@ jobs:
           - stable
           - nightly
 
-    name: ${{ matrix.version }} - x86_64-apple-darwin
+    name: ${{ matrix.version }} - aarch64-apple-darwin
     runs-on: macOS-latest
 
     steps:
@@ -20,7 +20,7 @@ jobs:
       - name: Install ${{ matrix.version }}
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: ${{ matrix.version }}-x86_64-apple-darwin
+          toolchain: ${{ matrix.version }}-aarch64-apple-darwin
 
       - name: Generate Cargo.lock
         run: cargo generate-lockfile
@@ -29,13 +29,13 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.cargo/registry
-          key: ${{ matrix.version }}-x86_64-apple-darwin-cargo-registry-trimmed-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ matrix.version }}-aarch64-apple-darwin-cargo-registry-trimmed-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Cache cargo index
         uses: actions/cache@v4
         with:
           path: ~/.cargo/git
-          key: ${{ matrix.version }}-x86_64-apple-darwin-cargo-index-trimmed-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ matrix.version }}-aarch64-apple-darwin-cargo-index-trimmed-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Run tests
         run: cargo test --all --all-features --no-fail-fast -- --nocapture
diff --git a/ntex-bytes/tests/test_serde.rs b/ntex-bytes/tests/test_serde.rs
index ab585437..6b7ced58 100644
--- a/ntex-bytes/tests/test_serde.rs
+++ b/ntex-bytes/tests/test_serde.rs
@@ -1,4 +1,3 @@
-#![cfg(feature = "serde")]
 #![deny(warnings, rust_2018_idioms)]
 
 use serde_test::{assert_tokens, Token};