Skip to content

Commit

Permalink
chore(tauri): bump linux installer script (#1960)
Browse files Browse the repository at this point in the history
* wip

* bump install script
  • Loading branch information
doums authored Jan 20, 2025
1 parent aee1282 commit 043ad53
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-nym-vpn-app-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
rm public/licenses-rust.json || true
npm run gen:licenses:rust
- name: Build tauri desktop client
- name: Build tauri app
working-directory: nym-vpn-app/src-tauri
env:
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/build-nym-vpn-app-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,10 @@ jobs:
# name: ${{ env.MULLVAD_LIB_NAME }}.lib
# path: ${{ env.TAURI_SRC }}/
#
# - name: Download mullvad sign: ${{ inputs.sign }}D_LIB_NAME }}.dll
# - name: Download mullvad lib artifact (winfw.lib)
# uses: actions/download-artifact@v4
# with:
# name: ${{ env.MULLVAD_LIB_NAME }}.dll
# path: ${{ env.TAURI_SRC }}/
#
# - name: Download/Unzip/Move wintun.zip, winpcap.zip also move wireguard lib for windows
Expand Down Expand Up @@ -285,7 +288,7 @@ jobs:
}
}' tauri.conf.json
- name: Build tauri desktop client with SSL.com signature
- name: Build tauri app ${{ inputs.sign && '(signed)' }}
working-directory: nym-vpn-app/src-tauri
shell: bash
env:
Expand Down
18 changes: 9 additions & 9 deletions .pkg/linux/install
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ BI="$ITL$BLD"
####

# AppImage
app_tag=nym-vpn-app-v1.2.0-malachite.3
app_version=1.2.0-malachite.3
app_tag=nym-vpn-app-v1.2.0-malachite.4
app_version=1.2.0-malachite.4
appimage_url="https://github.com/nymtech/nym-vpn-client/releases/download/$app_tag/NymVPN_${app_version}_x64.AppImage"
desktop_url="https://raw.githubusercontent.com/nymtech/nym-vpn-client/fb526935/nym-vpn-app/.pkg/app.desktop"
icon_url="https://raw.githubusercontent.com/nymtech/nym-vpn-client/fb526935/nym-vpn-app/.pkg/icon.svg"
Expand Down Expand Up @@ -186,18 +186,18 @@ select_components() {
operation=${1:-install}
choice=""
log " ${B_GRN}Select$RS the component(s) to $operation"
prompt=" ${BI_YLW}N$RS vpnd and app combo (default)\n ${BI_YLW}D$RS vpnd only\n ${BI_YLW}A$RS app only\n(${BI_YLW}N$RS/${BI_YLW}D$RS/${BI_YLW}A$RS) "
prompt=" ${BI_YLW}N$RS app and vpnd combo (default)\n ${BI_YLW}A$RS app only\n ${BI_YLW}D$RS vpnd only\n(${BI_YLW}N$RS/${BI_YLW}A$RS/${BI_YLW}D$RS) "
user_prompt choice "$prompt"

case "$choice" in
d | D)
_vpnd=0
sys_pkgs+=('nym-vpnd')
;;
a | A)
_app=0
sys_pkgs+=('nym-vpn-app')
;;
d | D)
_vpnd=0
sys_pkgs+=('nym-vpnd')
;;
n | N | '')
_vpnd=0
_app=0
Expand Down Expand Up @@ -476,8 +476,8 @@ cleanup() {

_install() {
log "$ITL${B_GRN}nym$RS${BI_GRY}VPN$RS ${BI}installer$RS\n"
log " nym-vpnd ${BI_YLW}$vpnd_version$RS ${I_GRY}daemon$RS"
log " app ${BI_YLW}$app_version$RS ${I_GRY}client$RS\n"
log " app ${BI_YLW}$app_version$RS ${I_GRY}client$RS"
log " nym-vpnd ${BI_YLW}$vpnd_version$RS ${I_GRY}daemon$RS\n"
# TODO remove this when we switch to stable
log " ${BI_YLW}⚠ currently this script only installs 'dev' versions$RS\n"

Expand Down
2 changes: 1 addition & 1 deletion nym-vpn-app/docs/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ and click on the _Run workflow_ button
3. :warning: if it is **not** a stable release check the _Pre-release_ tickbox

4. check the _dev_ tickbox if it is a dev release, not stable, \
(that enables the network env selector)
(enable in-app dev menu)

5. in the _nym-vpn-core release tag_ input, enter the core release \
tag that this app release targets, e.g. `nym-vpn-core-v1.2.3`
Expand Down
2 changes: 1 addition & 1 deletion nym-vpn-app/src/ui/Slider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function Slider({
</RxSlider.Track>
<RxSlider.Thumb
className={clsx(
'block size-5 rounded-full bg-malachite transition hover:scale-125 duration-150',
'block size-5 rounded-full bg-malachite transition hover:scale-110 duration-150',
'focus:outline-none focus:ring-4 focus:ring-malachite/35 focus:dark:ring-malachite/15',
)}
/>
Expand Down

0 comments on commit 043ad53

Please sign in to comment.