Skip to content

Commit b4a335c

Browse files
committed
ci: upgrade macos-13 to macos-15
1 parent 3dda93b commit b4a335c

File tree

8 files changed

+199
-200
lines changed

8 files changed

+199
-200
lines changed

.github/workflows/release.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424

2525
env:
2626
GO_VERSION: "1.23"
27-
NODE_VERSION: "20"
27+
NODE_VERSION: "24"
2828
FLUTTER_VERSION: "3.29.3"
2929

3030
jobs:
@@ -44,11 +44,11 @@ jobs:
4444
echo "version=$VERSION" >> $GITHUB_OUTPUT
4545
echo "current version is $VERSION"
4646
47-
build-macos-arm64-lib:
47+
build-macos-x64-lib:
4848
if: ${{ github.event_name == 'release' || github.event.inputs.platform == 'all' || github.event.inputs.platform == 'macos' }}
4949
needs:
5050
- get-version
51-
runs-on: macos-latest
51+
runs-on: macos-15-intel
5252
steps:
5353
- name: Checkout
5454
uses: actions/checkout@v4
@@ -67,15 +67,15 @@ jobs:
6767
- name: Upload dylib
6868
uses: actions/upload-artifact@v4
6969
with:
70-
name: macos-arm64-lib
70+
name: macos-x64-lib
7171
path: server/libserver.dylib
7272

7373
build-macos:
7474
if: ${{ github.event_name == 'release' || github.event.inputs.platform == 'all' || github.event.inputs.platform == 'macos' }}
7575
needs:
7676
- get-version
77-
- build-macos-arm64-lib
78-
runs-on: macos-13
77+
- build-macos-x64-lib
78+
runs-on: macos-15
7979
steps:
8080
- name: Checkout
8181
uses: actions/checkout@v4
@@ -101,25 +101,25 @@ jobs:
101101
python3 -m pip install setuptools --break-system-packages
102102
npm install -g appdmg
103103
104-
- name: Download arm64 dylib
104+
- name: Download x64 dylib
105105
uses: actions/download-artifact@v4
106106
with:
107-
name: macos-arm64-lib
108-
path: server/arm64
107+
name: macos-x64-lib
108+
path: server/x64
109109

110-
- name: Build amd64 dylib
110+
- name: Build arm64 dylib
111111
run: |
112112
cd server
113113
go build -ldflags="-w -s -X github.com/honmaple/maple-file/server/internal/app.VERSION=${{ needs.get-version.outputs.version }}" -buildmode=c-shared -o libserver.dylib github.com/honmaple/maple-file/server/cmd/desktop
114114
115115
- name: Create dylib
116116
run: |
117117
mkdir -p app/macos/Frameworks
118-
cp server/libserver.dylib app/macos/Frameworks/amd64-lib
119-
cp server/arm64/libserver.dylib app/macos/Frameworks/arm64-lib
118+
cp server/libserver.dylib app/macos/Frameworks/arm64-lib
119+
cp server/x64/libserver.dylib app/macos/Frameworks/x64-lib
120120
121121
cd app/macos/Frameworks
122-
lipo -create -output libserver.dylib amd64-lib arm64-lib
122+
lipo -create -output libserver.dylib arm64-lib x64-lib
123123
124124
- name: Build dmg
125125
run: |
@@ -195,7 +195,7 @@ jobs:
195195
if: ${{ github.event_name == 'release' || github.event.inputs.platform == 'all' || github.event.inputs.platform == 'ios' }}
196196
needs:
197197
- get-version
198-
runs-on: macos-latest
198+
runs-on: macos-15
199199

200200
steps:
201201
- name: Checkout

app/.fvmrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"flutter": "3.29.3"
3+
}

app/.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,7 @@ app.*.map.json
5050
**/macos/Frameworks/
5151
**/android/app/libs/
5252

53-
.cxx/
53+
.cxx/
54+
55+
# FVM Version Cache
56+
.fvm/

app/android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pluginManagement {
1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
2121
id "com.android.application" version "8.3.2" apply false
22-
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
22+
id "org.jetbrains.kotlin.android" version "2.2.0" apply false
2323
}
2424

2525
include ":app"

app/ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ SPEC CHECKSUMS:
135135
external_path: fd37c654b69a1336e33a2403f48383ae6100e443
136136
file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
137137
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
138-
flutter_native_splash: 6cad9122ea0fad137d23137dd14b937f3e90b145
138+
flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
139139
fvp: 3f9a3f729e969cb76d1692c615c9e33508563121
140140
image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
141141
mdk: 7cccbeebec9a85f4e240ac14d9f603273636bb3b
@@ -147,7 +147,7 @@ SPEC CHECKSUMS:
147147
SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
148148
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
149149
video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
150-
wakelock_plus: 04623e3f525556020ebd4034310f20fe7fda8b49
150+
wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
151151

152152
PODFILE CHECKSUM: 7be2f5f74864d463a8ad433546ed1de7e0f29aef
153153

app/macos/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ SPEC CHECKSUMS:
108108
screen_retriever_macos: 452e51764a9e1cdb74b3c541238795849f21557f
109109
url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673
110110
video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
111-
wakelock_plus: 21ddc249ac4b8d018838dbdabd65c5976c308497
111+
wakelock_plus: 917609be14d812ddd9e9528876538b2263aaa03b
112112
window_manager: 1d01fa7ac65a6e6f83b965471b1a7fdd3f06166c
113113

114114
PODFILE CHECKSUM: 9ebaf0ce3d369aaa26a9ea0e159195ed94724cf3

0 commit comments

Comments
 (0)