.github/workflows/android.yml

@@ -1,9 +1,4 @@
 name: CI_Android
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 on:
   push:
     branches: [ main ]
@@ -12,7 +7,7 @@ on:
 
 jobs:
   Android:
-    runs-on: macos-latest-large
+    runs-on: macos-latest
     defaults:
       run:
         working-directory: build
@@ -23,19 +18,15 @@ jobs:
         run: mkdir -p build
         working-directory: .
 
-      - uses: actions/setup-java@v4
-        with:
-          java-version: 8
-          distribution: zulu
-
-      - name: Start Emulator
+      - name: Start emulator
         run: |
           echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install 'system-images;android-24;default;x86_64'
           echo "no" | $ANDROID_HOME/tools/bin/avdmanager create avd -n xamarin_android_emulator -k 'system-images;android-24;default;x86_64' --force
           $ANDROID_HOME/emulator/emulator -list-avds
-          echo "Starting emulator..."
-          nohup $ANDROID_HOME/emulator/emulator -no-audio -no-snapshot -avd xamarin_android_emulator &> /dev/null &
-          echo "Emulator starting in background"
+          echo "Starting emulator"
+          # Start emulator in background
+          nohup $ANDROID_HOME/emulator/emulator -avd xamarin_android_emulator -no-snapshot > /dev/null 2>&1 &
+          echo "Emulator starting"
 
       - name: Configure
         run: cmake -Werror=dev -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=16 -DANDROID_ABI=x86_64 -DCMAKE_BUILD_TYPE=Debug ..
@@ -44,11 +35,11 @@ jobs:
         run: cmake --build . --parallel
 
       - name: Wait for emulator ready
-        timeout-minutes: 2
         run: |
           $ANDROID_HOME/platform-tools/adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed | tr -d '\r') ]]; do sleep 10; done; input keyevent 82'
           $ANDROID_HOME/platform-tools/adb devices
           $ANDROID_HOME/platform-tools/adb shell getprop ro.product.cpu.abi
+          echo "Emulator started"
 
       - name: Deploy tests
         run: |

include/gsl/span

@@ -64,12 +64,10 @@
 #endif
 
 // Turn off clang unsafe buffer warnings as all accessed are guarded by runtime checks
-#if defined(__clang__)
-#if __has_warning("-Wunsafe-buffer-usage")
+#if defined(__clang__) && __has_warning("-Wunsafe-buffer-usage")
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
-#endif // __has_warning("-Wunsafe-buffer-usage")
-#endif // defined(__clang__)
+#endif // defined(__clang__) && __has_warning("-Wunsafe-buffer-usage")
 
 namespace gsl
 {
@@ -854,10 +852,8 @@ as_writable_bytes(span<ElementType, Extent> s) noexcept
 #pragma GCC diagnostic pop
 #endif // __GNUC__ > 6
 
-#if defined(__clang__)
-#if __has_warning("-Wunsafe-buffer-usage")
+#if defined(__clang__) && __has_warning("-Wunsafe-buffer-usage")
 #pragma clang diagnostic pop
-#endif // __has_warning("-Wunsafe-buffer-usage")
-#endif // defined(__clang__)
+#endif
 
 #endif // GSL_SPAN_H

include/gsl/util

@@ -41,12 +41,10 @@
 #endif // _MSC_VER
 
 // Turn off clang unsafe buffer warnings as all accessed are guarded by runtime checks
-#if defined(__clang__)
-#if __has_warning("-Wunsafe-buffer-usage")
+#if defined(__clang__) && __has_warning("-Wunsafe-buffer-usage")
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
-#endif // __has_warning("-Wunsafe-buffer-usage")
-#endif // defined(__clang__)
+#endif // defined(__clang__) && __has_warning("-Wunsafe-buffer-usage")
 
 #if defined(__cplusplus) && (__cplusplus >= 201703L)
 #define GSL_NODISCARD [[nodiscard]]
@@ -162,10 +160,8 @@ constexpr auto at(std::span<T, extent> sp, const index i) -> decltype(sp[sp.size
 
 #endif // _MSC_VER
 
-#if defined(__clang__)
-#if __has_warning("-Wunsafe-buffer-usage")
+#if defined(__clang__) && __has_warning("-Wunsafe-buffer-usage")
 #pragma clang diagnostic pop
-#endif // __has_warning("-Wunsafe-buffer-usage")
-#endif // defined(__clang__)
+#endif
 
 #endif // GSL_UTIL_H

tests/CMakeLists.txt

@@ -146,7 +146,6 @@ else()
           -Wno-global-constructors # GTest
           -Wno-missing-prototypes
           -Wno-padded
-          -Wno-switch-default
           -Wno-unknown-attributes
           -Wno-used-but-marked-unused # GTest EXPECT_DEATH
           -Wno-weak-vtables