Skip to content

Commit 348c968

Browse files
committed
regression: debug/release switch broken
1 parent 6dddc59 commit 348c968

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,11 @@ jobs:
101101
./scripts/check-validity.sh
102102
md5sum -c checksum
103103
104+
# TODO: remove all meta.json stuff after 2026-03-02
104105
- name: Generate meta.json
105106
if: ${{ matrix.arch == 'arm64' && matrix.type == 'Release' }}
106107
run: |
107-
echo "{\"object\": {\"sha\": \"$(git rev-parse HEAD)\"}}" > meta.json
108+
echo "{\"object\": {\"sha\": \"6dddc59c941ead66d0020ec7eef9dea85c401ffb\"}}" > meta.json
108109
109110
- name: Upload meta.json
110111
if: ${{ matrix.arch == 'arm64' && matrix.type == 'Release' }}

src/config/about.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ struct AboutView: View {
5858
@State private var uninstalling = false
5959
@State private var uninstallFailed = false
6060
@State private var targetTag: String? = nil
61+
@State private var latestAvailable = false
6162

6263
var body: some View {
6364
VStack {
@@ -168,15 +169,15 @@ struct AboutView: View {
168169
} label: {
169170
Text("Switch to Release")
170171
}.disabled(
171-
targetTag == nil || viewModel.state == .downloading || viewModel.state == .installing
172+
!latestAvailable || viewModel.state == .downloading || viewModel.state == .installing
172173
)
173174
} else {
174175
Button {
175176
showSwitchToDebug = true
176177
} label: {
177178
Text("Switch to Debug")
178179
}.disabled(
179-
targetTag != "latest" || viewModel.state == .downloading
180+
!latestAvailable || viewModel.state == .downloading
180181
|| viewModel.state == .installing
181182
).sheet(
182183
isPresented: $showSwitchToDebug
@@ -305,6 +306,7 @@ struct AboutView: View {
305306
viewModel.state = .checking
306307
checkMainUpdate { success, latestCompatible, latest, stable in
307308
if success {
309+
latestAvailable = latestCompatible
308310
if let stable = stable {
309311
// latest >= stable > current
310312
targetTag = stable.tag
@@ -331,7 +333,7 @@ struct AboutView: View {
331333
}
332334

333335
func update(debug: Bool) {
334-
guard let tag = targetTag else {
336+
guard let tag = latestAvailable ? "latest" : targetTag else {
335337
FCITX_ERROR("Calling update with nil tag")
336338
return
337339
}

0 commit comments

Comments
 (0)