From c3f6eec7d63b06abd3f46444a5a5a70a00a7deeb Mon Sep 17 00:00:00 2001 From: Vladimir Stoilov Date: Sat, 1 Mar 2025 01:13:51 +0200 Subject: [PATCH] Fix Earthly build --- Earthfile | 8 ++++---- desktop/angular/package-lock.json | 10 ++++++++++ desktop/angular/package.json | 1 + 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Earthfile b/Earthfile index dae6aa93..d1de17eb 100644 --- a/Earthfile +++ b/Earthfile @@ -2,8 +2,8 @@ VERSION --arg-scope-and-set --global-cache 0.8 ARG --global go_version = 1.22 ARG --global node_version = 18 -ARG --global rust_version = 1.79 -ARG --global tauri_version = "2.0.1" +ARG --global rust_version = 1.81 +ARG --global tauri_version = "2.2.5" ARG --global golangci_lint_version = 1.57.1 ARG --global go_builder_image = "golang:${go_version}-alpine" @@ -426,7 +426,7 @@ rust-base: DO rust+INIT --keep_fingerprints=true # For now we need tauri-cli 2.0.0 for bulding - DO rust+CARGO --args="install tauri-cli --version 2.1.0 --locked" + DO rust+CARGO --args="install tauri-cli --version 2.2.7 --locked" # Explicitly cache here. SAVE IMAGE --cache-hint @@ -542,7 +542,7 @@ release-prep: # Copy required artifacts RUN cp ./output/download/windows_amd64/portmaster-kext.sys ./output/binary/windows_amd64/portmaster-kext.sys RUN cp ./output/download/windows_amd64/portmaster-kext.pdb ./output/binary/windows_amd64/portmaster-kext.pdb - RUN cp ./output/download/windows_amd64/portmaster-core.dll ./output/binary/windows_amd64/portmaster-core.dll + # RUN cp ./output/download/windows_amd64/portmaster-core.dll ./output/binary/windows_amd64/portmaster-core.dll # Create new binary index from artifacts RUN ./updatemgr scan --dir "./output/binary" > ./output/binary/index.json diff --git a/desktop/angular/package-lock.json b/desktop/angular/package-lock.json index 08606cf0..9d6d9e76 100644 --- a/desktop/angular/package-lock.json +++ b/desktop/angular/package-lock.json @@ -18,6 +18,7 @@ "@angular/platform-browser": "^16.0.1", "@angular/platform-browser-dynamic": "^16.0.1", "@angular/router": "^16.0.1", + "@ctrl/tinycolor": "^4.1.0", "@fortawesome/angular-fontawesome": "^0.13.0", "@fortawesome/fontawesome-svg-core": "^6.4.0", "@fortawesome/free-brands-svg-icons": "^6.4.0", @@ -3165,6 +3166,15 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "node_modules/@ctrl/tinycolor": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-4.1.0.tgz", + "integrity": "sha512-WyOx8cJQ+FQus4Mm4uPIZA64gbk3Wxh0so5Lcii0aJifqwoVOlfFtorjLE0Hen4OYyHZMXDWqMmaQemBhgxFRQ==", + "license": "MIT", + "engines": { + "node": ">=14" + } + }, "node_modules/@discoveryjs/json-ext": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", diff --git a/desktop/angular/package.json b/desktop/angular/package.json index 18158086..1e1b8d9e 100644 --- a/desktop/angular/package.json +++ b/desktop/angular/package.json @@ -32,6 +32,7 @@ "@angular/platform-browser": "^16.0.1", "@angular/platform-browser-dynamic": "^16.0.1", "@angular/router": "^16.0.1", + "@ctrl/tinycolor": "^4.1.0", "@fortawesome/angular-fontawesome": "^0.13.0", "@fortawesome/fontawesome-svg-core": "^6.4.0", "@fortawesome/free-brands-svg-icons": "^6.4.0",