From b56578ede3301cceaccf56a5526e2748d4dc0f86 Mon Sep 17 00:00:00 2001 From: yimiaoxiehou Date: Fri, 17 Jan 2025 09:13:47 +0800 Subject: [PATCH 1/3] Update action.yml --- action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/action.yml b/action.yml index 0f719e0..04f64d3 100644 --- a/action.yml +++ b/action.yml @@ -134,7 +134,7 @@ runs: shell: bash - name: Install Linux Wails deps if: inputs.build == 'true' && runner.os == 'Linux' - run: sudo apt-get update && sudo apt-get install libgtk-3-0 libwebkit2gtk-4.0-dev gcc-aarch64-linux-gnu + run: sudo apt-get update && sudo apt-get install libgtk-3-0 libwebkit2gtk-4.1-dev gcc-aarch64-linux-gnu shell: bash - name: Install macOS Wails deps if: runner.os == 'macOS' @@ -149,7 +149,7 @@ runs: - name: Build App if: inputs.build == 'true' && runner.os == 'Linux' working-directory: ${{ inputs.app-working-directory }} - run: wails build --platform ${{inputs.build-platform}} -webview2 ${{inputs.wails-build-webview2}} -o ${{inputs.build-name}} -tags '${{inputs.build-tags}}' + run: wails build --platform ${{inputs.build-platform}} -webview2 ${{inputs.wails-build-webview2}} -o ${{inputs.build-name}} -tags '${{inputs.build-tags}},webkit2_41' shell: bash - name: Build Windows App if: inputs.build == 'true' && runner.os == 'Windows' && inputs.nsis == 'false' From 436d9a5b2477e55c9470bf00d46e182c52bbb3f8 Mon Sep 17 00:00:00 2001 From: Snider Date: Fri, 17 Jan 2025 03:02:17 +0000 Subject: [PATCH 2/3] Update action.yml In theory this should work, i've made some edits, you have always been able to pass build tags, in theory, if you have webkit2_41 in your tags list, it'll install the other package. --- action.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/action.yml b/action.yml index 04f64d3..e108975 100644 --- a/action.yml +++ b/action.yml @@ -133,7 +133,11 @@ runs: run: go install github.com/wailsapp/wails/v2/cmd/wails@${{inputs.wails-version}} shell: bash - name: Install Linux Wails deps - if: inputs.build == 'true' && runner.os == 'Linux' + if: inputs.build == 'true' && runner.os == 'Linux' && !contains(inputs.build-tags, 'webkit2_41') + run: sudo apt-get update && sudo apt-get install libgtk-3-0 libwebkit2gtk-4.0-dev gcc-aarch64-linux-gnu + shell: bash + - name: Install Linux Wails deps + if: inputs.build == 'true' && runner.os == 'Linux' && contains(inputs.build-tags, 'webkit2_41') run: sudo apt-get update && sudo apt-get install libgtk-3-0 libwebkit2gtk-4.1-dev gcc-aarch64-linux-gnu shell: bash - name: Install macOS Wails deps @@ -149,7 +153,7 @@ runs: - name: Build App if: inputs.build == 'true' && runner.os == 'Linux' working-directory: ${{ inputs.app-working-directory }} - run: wails build --platform ${{inputs.build-platform}} -webview2 ${{inputs.wails-build-webview2}} -o ${{inputs.build-name}} -tags '${{inputs.build-tags}},webkit2_41' + run: wails build --platform ${{inputs.build-platform}} -webview2 ${{inputs.wails-build-webview2}} -o ${{inputs.build-name}} -tags '${{inputs.build-tags}}' shell: bash - name: Build Windows App if: inputs.build == 'true' && runner.os == 'Windows' && inputs.nsis == 'false' From b9889344b5472a7123d4b46503ff7daf9a62d6ba Mon Sep 17 00:00:00 2001 From: Snider Date: Fri, 17 Jan 2025 03:12:30 +0000 Subject: [PATCH 3/3] updates build tests --- .github/workflows/lethean-desktop.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lethean-desktop.yml b/.github/workflows/lethean-desktop.yml index 72da9b1..54fa14c 100644 --- a/.github/workflows/lethean-desktop.yml +++ b/.github/workflows/lethean-desktop.yml @@ -16,10 +16,28 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: # This workflow contains a single job called "build" - build: + ubuntu-latest: # The type of runner that the job will run on runs-on: ubuntu-latest + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + with: + repository: 'letheanVPN/desktop' + submodules: recursive + - uses: dAppServer/wails-build-action@main + with: + build-name: lethean + build-platform: linux/amd64 + build-tags: webkit2_41 + wails-build-webview2: "embed" + wails-version: v2.3.1 + ubuntu2004: + # The type of runner that the job will run on + runs-on: ubuntu-20.04 + # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it