From 754fedb180fb41a65464e25c2d200d316c16ad48 Mon Sep 17 00:00:00 2001
From: fxliang <fx.liang@outlook.com>
Date: Sun, 16 Feb 2025 22:05:30 +0800
Subject: [PATCH] ci: bump librime 1.13.1

ci: always build with latest released librime
chore: remove github.install.bat(never used any longer)
chore(get-rime.ps1): auto get 7z cmd from github repo if 7z.exe not in path
---
 .github/workflows/commit-ci.yml  |  4 ++--
 .github/workflows/release-ci.yml |  2 +-
 get-rime.ps1                     | 16 ++++++++++++++--
 github.install.bat               | 33 --------------------------------
 librime                          |  2 +-
 5 files changed, 18 insertions(+), 39 deletions(-)
 delete mode 100644 github.install.bat

diff --git a/.github/workflows/commit-ci.yml b/.github/workflows/commit-ci.yml
index adfe5b8ae..e40cfdcc7 100644
--- a/.github/workflows/commit-ci.yml
+++ b/.github/workflows/commit-ci.yml
@@ -91,7 +91,7 @@ jobs:
         shell: pwsh
         run: |
           $ErrorActionPreference = 'Stop'
-          .\get-rime.ps1 -tag 1.13.0 -use dev
+          .\get-rime.ps1 -use dev
 
       - name: Build data
         shell: pwsh
@@ -171,7 +171,7 @@ jobs:
         shell: pwsh
         run: |
           $ErrorActionPreference = 'Stop'
-          .\get-rime.ps1 -tag 1.13.0 -use dev
+          .\get-rime.ps1 -use dev
 
 
       - name: Build data
diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
index 4b09044b8..0bc3905d3 100644
--- a/.github/workflows/release-ci.yml
+++ b/.github/workflows/release-ci.yml
@@ -58,7 +58,7 @@ jobs:
         shell: pwsh
         run: |
           $ErrorActionPreference = 'Stop'
-          .\get-rime.ps1 -tag 1.13.0 -use dev
+          .\get-rime.ps1 -use dev
 
       - name: Build data
         run: |
diff --git a/get-rime.ps1 b/get-rime.ps1
index c74ded5f5..dd394b22c 100755
--- a/get-rime.ps1
+++ b/get-rime.ps1
@@ -144,8 +144,20 @@ try {
 } catch {
   $cmdOk = $false
   if($extract) {
-    Write-Host "❌ Error: 7z is not available. Maybe 7z is not in PATH or not installed"
-    SafeExit
+    Write-Host "❌ Error: 7z is not available. Maybe 7z is not in PATH or not installed";
+    $original_7z_url = "https://github.com/ip7z/7zip/releases/download/24.08/7zr.exe";
+    if ($url_pat -and $url_replace) {
+      $original_7z_url = $original_7z_url -replace $url_pat, $url_replace;
+    }
+    try {
+      Write-Host "We will download 7z console tool from: $original_7z_url";
+      Invoke-WebRequest -Uri $original_7z_url -OutFile ".\7z.exe";
+      $env:Path += ";$PWD";
+      $cmdOk = $true
+    } catch{
+      Write-Host "Error download 7z commandline tool";
+      SafeExit
+    }
   }
 }
 # check 64 bit
diff --git a/github.install.bat b/github.install.bat
deleted file mode 100644
index e7d7d46e7..000000000
--- a/github.install.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-setlocal
-
-git submodule init
-git submodule update plum
-
-set rime_version=1.13.0
-set rime_hash=e8184dc
-
-set download_archive=rime-%rime_hash%-Windows-msvc-x86.7z
-set download_archive_deps=rime-deps-%rime_hash%-Windows-msvc-x86.7z
-set download_archive_x64=rime-%rime_hash%-Windows-msvc-x64.7z
-set download_archive_deps_x64=rime-deps-%rime_hash%-Windows-msvc-x64.7z
-
-curl -LO https://github.com/rime/librime/releases/download/%rime_version%/%download_archive%
-curl -LO https://github.com/rime/librime/releases/download/%rime_version%/%download_archive_deps%
-curl -LO https://github.com/rime/librime/releases/download/%rime_version%/%download_archive_x64%
-curl -LO https://github.com/rime/librime/releases/download/%rime_version%/%download_archive_deps_x64%
-
-7z x %download_archive% * -olibrime\ -y
-7z x %download_archive_deps% * -olibrime\ -y
-7z x %download_archive_x64% * -olibrime_x64\ -y
-7z x %download_archive_deps_x64% * -olibrime_x64\ -y
-
-copy /Y librime\dist\include\rime_*.h include\
-copy /Y librime\dist\lib\rime.lib lib\
-copy /Y librime\dist\lib\rime.dll output\Win32\
-
-copy /Y librime_x64\dist\lib\rime.lib lib64\
-copy /Y librime_x64\dist\lib\rime.dll output\
-
-if not exist output\data\opencc mkdir output\data\opencc
-copy /Y librime\share\opencc\*.* output\data\opencc\
-
diff --git a/librime b/librime
index e8184dcea..1c2335815 160000
--- a/librime
+++ b/librime
@@ -1 +1 @@
-Subproject commit e8184dceaf9a89a21d6dc25c1850779cd652c472
+Subproject commit 1c23358157934bd6e6d6981f0c0164f05393b497