Skip to content

Commit

Permalink
Merge pull request #280 from DefGuard/fix_close_tunel_on_quit
Browse files Browse the repository at this point in the history
Catch Ctrl-C
  • Loading branch information
teon authored Aug 21, 2024
2 parents d85d255 + c60adf7 commit f3b58de
Show file tree
Hide file tree
Showing 40 changed files with 7,196 additions and 5,449 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,26 @@ on:
branches:
- main
- dev

pull_request:
branches:
- main
- dev

jobs:
lint-web:
runs-on: [self-hosted, X64]
runs-on: [self-hosted, Linux, X64]

steps:
- uses: actions/checkout@v4
with:
submodules: 'recursive'
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '20'

- uses: pnpm/action-setup@v2
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Build app & create release"
name: 'Build app & create release'
on:
push:
tags:
Expand All @@ -18,9 +18,9 @@ jobs:
ref: master
fetch-depth: 0
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: '1.20'
go-version: '1.22'
- name: Build wireguard-go binary
run: make
env:
Expand Down Expand Up @@ -59,18 +59,18 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
submodules: "recursive"
submodules: 'recursive'
- name: Write release version
run: |
VERSION=$(echo ${GITHUB_REF_NAME#v} | cut -d '-' -f1)
echo Version: $VERSION
echo "VERSION=$VERSION" >> $GITHUB_ENV
- uses: actions/setup-node@v3
with:
node-version: "20"
node-version: '20'
- uses: pnpm/action-setup@v2
with:
version: 8
version: 9
run_install: false
- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -162,18 +162,18 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
submodules: "recursive"
submodules: 'recursive'
- name: Write release version
run: |
VERSION=$(echo ${GITHUB_REF_NAME#v} | cut -d '-' -f1)
echo Version: $VERSION
echo "VERSION=$VERSION" >> $GITHUB_ENV
- uses: actions/setup-node@v3
with:
node-version: "20"
node-version: '20'
- uses: pnpm/action-setup@v2
with:
version: 8
version: 9
run_install: false
- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -203,12 +203,12 @@ jobs:
uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
APPLE_SIGNING_IDENTITY: "Developer ID Application: TEONITE (6WD6W6WQNV)"
APPLE_SIGNING_IDENTITY: 'Developer ID Application: TEONITE (6WD6W6WQNV)'
APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
APPLE_ID: "[email protected]"
APPLE_ID: '[email protected]'
APPLE_PASSWORD: ${{ secrets.NOTARYTOOL_APP_SPECIFIC_PASSWORD }}
APPLE_TEAM_ID: "6WD6W6WQNV"
APPLE_TEAM_ID: '6WD6W6WQNV'
with:
args: --target ${{ matrix.target }} -v
- name: Build installation package
Expand Down Expand Up @@ -240,18 +240,18 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
submodules: "recursive"
submodules: 'recursive'
- name: Write release version
run: |
$env:VERSION=echo ($env:GITHUB_REF_NAME.Substring(1) -Split "-")[0]
echo Version: $env:VERSION
echo "VERSION=$env:VERSION" >> $env:GITHUB_ENV
- uses: actions/setup-node@v3
with:
node-version: "20"
node-version: '20'
- uses: pnpm/action-setup@v2
with:
version: 8
version: 9
run_install: false
- name: Get pnpm store directory
shell: bash
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,25 @@ env:
jobs:
test:
runs-on: [self-hosted, Linux, X64]
container: rust:1.75
container: rust:1
defaults:
run:
working-directory: ./src-tauri

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
- name: Debug
run: echo ${{ github.ref_name }}
- name: Cache
uses: Swatinem/rust-cache@v2
- name: install linux deps
- name: Install required packages
run: |
apt-get update
apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf libssl-dev unzip
- name: install protobuf compiler
- name: Install protobuf compiler
run: |
PB_REL='https://github.com/protocolbuffers/protobuf/releases'
PB_VERSION='3.20.0' && curl -LO $PB_REL/download/v$PB_VERSION/protoc-$PB_VERSION-linux-x86_64.zip
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
"dependencies": {
"@floating-ui/react": "^0.26.3",
"@hookform/resolvers": "^3.3.2",
"@ladle/react": "^3.3.1",
"@ladle/react": "^4.1.0",
"@stablelib/base64": "^1.0.1",
"@stablelib/x25519": "^1.0.3",
"@tanstack/query-core": "^5.12.1",
"@tanstack/react-virtual": "3.0.0-beta.54",
"@tauri-apps/api": "^1.5.1",
"@tauri-apps/api": "^1.6.0",
"@types/byte-size": "^8.1.2",
"byte-size": "^8.1.1",
"classnames": "^2.3.2",
Expand Down Expand Up @@ -87,7 +87,7 @@
"@svgr/cli": "^8.1.0",
"@tanstack/react-query": "^5.12.2",
"@tanstack/react-query-devtools": "^5.12.2",
"@tauri-apps/cli": "^1.5.7",
"@tauri-apps/cli": "^1.6.0",
"@types/file-saver": "^2.0.7",
"@types/lodash-es": "^4.17.12",
"@types/node": "^20.10.3",
Expand All @@ -113,7 +113,7 @@
"typesafe-i18n": "^5.26.2",
"typescript": "^5.3.2",
"typescript-eslint-language-service": "^5.0.5",
"vite": "^4.5.1"
"vite": "^4.5.2"
},
"volta": {
"node": "20.5.1"
Expand Down
Loading

0 comments on commit f3b58de

Please sign in to comment.