use macos-15; reduce AlertToast cmake

fcitx-contrib · Nov 27, 2024 · 594a65c · 594a65c
1 parent 01dc481
commit 594a65c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   lint:
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@v4
 
@@ -35,7 +35,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     strategy:
       matrix:
-        os: [macos-14, macos-13]
+        os: [macos-15, macos-13]
 
     steps:
       - uses: actions/checkout@v4
@@ -84,7 +84,7 @@ jobs:
             *.zip
 
       - name: Create Nightly release
-        if: ${{ (matrix.os == 'macos-14') && (github.ref == 'refs/heads/master') }}
+        if: ${{ (matrix.os == 'macos-15') && (github.ref == 'refs/heads/master') }}
         uses: 'marvinpinto/action-automatic-releases@latest'
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/deps/AlertToast b/deps/AlertToast
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
@@ -1,3 +1 @@
-file(GLOB ALERT_TOAST_FILES CONFIGURE_DEPENDS AlertToast/src/*.swift)
-add_library(AlertToast STATIC ${ALERT_TOAST_FILES})
-set_target_properties(AlertToast PROPERTIES Swift_MODULE_NAME AlertToast)
+add_subdirectory(AlertToast)