Skip to content

Commit e0bb969

Browse files
NikitaSkrynnikNikitaSkrynnik
committed
remove code signing for a while
Signed-off-by: Nikita Skrynnik <[email protected]>
1 parent 3e573bf commit e0bb969

File tree

3 files changed

+46
-42
lines changed

3 files changed

+46
-42
lines changed

‎.github/workflows/release.yaml‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -69,47 +69,47 @@ jobs:
6969
- name: Install Node Modules
7070
run: npm install
7171

72-
- name: Import Apple Developer Certificate
73-
env:
74-
APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
75-
APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
76-
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
77-
run: |
78-
echo $APPLE_CERTIFICATE | base64 --decode > certificate.p12
79-
security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
80-
security default-keychain -s build.keychain
81-
security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
82-
security set-keychain-settings -t 3600 -u build.keychain
83-
security import certificate.p12 -k build.keychain -P "$APPLE_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
84-
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain
85-
security find-identity -v -p codesigning build.keychain
72+
# - name: Import Apple Developer Certificate
73+
# env:
74+
# APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
75+
# APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
76+
# KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
77+
# run: |
78+
# echo $APPLE_CERTIFICATE | base64 --decode > certificate.p12
79+
# security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
80+
# security default-keychain -s build.keychain
81+
# security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
82+
# security set-keychain-settings -t 3600 -u build.keychain
83+
# security import certificate.p12 -k build.keychain -P "$APPLE_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
84+
# security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain
85+
# security find-identity -v -p codesigning build.keychain
8686

87-
- name: Verify Certificate
88-
run: |
89-
CERT_INFO=$(security find-identity -v -p codesigning build.keychain | grep -E "(Apple Development|Developer ID|Apple Distribution)" | head -1)
90-
CERT_ID=$(echo "$CERT_INFO" | awk -F'"' '{print $2}')
91-
echo "CERT_ID=$CERT_ID" >> $GITHUB_ENV
92-
echo "Certificate imported."
87+
# - name: Verify Certificate
88+
# run: |
89+
# CERT_INFO=$(security find-identity -v -p codesigning build.keychain | grep -E "(Apple Development|Developer ID|Apple Distribution)" | head -1)
90+
# CERT_ID=$(echo "$CERT_INFO" | awk -F'"' '{print $2}')
91+
# echo "CERT_ID=$CERT_ID" >> $GITHUB_ENV
92+
# echo "Certificate imported."
9393

94-
- name: decode API key to file
95-
env:
96-
APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }}
97-
run: |
98-
API_KEY_PATH=$PWD/privatekey.p8
99-
echo "$APPLE_API_KEY_BASE64" | base64 --decode > $API_KEY_PATH
100-
echo "APPLE_API_KEY_PATH=$API_KEY_PATH" >> $GITHUB_ENV
94+
# - name: decode API key to file
95+
# env:
96+
# APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }}
97+
# run: |
98+
# API_KEY_PATH=$PWD/privatekey.p8
99+
# echo "$APPLE_API_KEY_BASE64" | base64 --decode > $API_KEY_PATH
100+
# echo "APPLE_API_KEY_PATH=$API_KEY_PATH" >> $GITHUB_ENV
101101

102102
- name: Build Huly Browser
103103
uses: tauri-apps/tauri-action@v0
104104
id: tauri-build
105105
env:
106106
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
107-
APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
108-
APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
109-
APPLE_SIGNING_IDENTITY: ${{ env.CERT_ID }}
110-
APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
111-
APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
112-
APPLE_API_KEY_PATH: ${{ env.APPLE_API_KEY_PATH }}
107+
# APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
108+
# APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
109+
# APPLE_SIGNING_IDENTITY: ${{ env.CERT_ID }}
110+
# APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
111+
# APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
112+
# APPLE_API_KEY_PATH: ${{ env.APPLE_API_KEY_PATH }}
113113
with:
114114
tagName: v__VERSION__
115115
releaseName: 'Huly Browser v__VERSION__'

‎package-lock.json‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src-tauri/src/cef/mod.rs‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
use std::{
2-
fs, path::PathBuf, process::Command, sync::{Arc, Mutex}
2+
fs,
3+
process::Command,
4+
sync::{Arc, Mutex},
35
};
46

57
use tauri::Manager;
@@ -53,14 +55,14 @@ pub fn download_cef(app_handle: tauri::AppHandle) -> Result<(), String> {
5355
pub async fn launch_cef(app_handle: tauri::AppHandle) -> Result<String, String> {
5456
let (cef_dir, cef_cache) = get_cef_paths(&app_handle)?;
5557

56-
let temp_cef_dir = PathBuf::from("/tmp/huly-cef");
58+
let temp_cef_dir = std::env::temp_dir().join("huly-cef");
5759
_ = fs::remove_dir_all(&temp_cef_dir);
5860
copy_dir_all(&cef_dir, &temp_cef_dir).map_err(|e| format!("failed to copy CEF: {e}"))?;
5961

6062
let cef_exe = temp_cef_dir.join(CEF_EXE);
6163

6264
let port = find_available_port().map_err(|e| format!("couldn't find available port: {e}"))?;
63-
let mut command = Command::new(cef_exe);
65+
let mut command = Command::new(&cef_exe);
6466
command
6567
.args(["--port", &port.to_string()])
6668
.args(["--cache-path", cef_cache.to_str().unwrap()]);
@@ -72,11 +74,13 @@ pub async fn launch_cef(app_handle: tauri::AppHandle) -> Result<String, String>
7274
}
7375

7476
let cef = command.spawn().map_err(|e| {
75-
format!("failed to launch CEF with params port {port} cache-dir {cef_cache:?}: {e}")
77+
format!("failed to launch CEF ({cef_exe:?}) with params port {port} cache-dir {cef_cache:?}: {e}")
7678
})?;
7779

7880
wait_for_cef(port).map_err(|e| {
79-
format!("CEF failed to start with params port {port} cache-dir {cef_cache:?}: {e}")
81+
format!(
82+
"CEF ({cef_exe:?}) failed to start with params port {port} cache-dir {cef_cache:?}: {e}"
83+
)
8084
})?;
8185

8286
app_handle

0 commit comments

Comments
 (0)