Skip to content
Snippets Groups Projects

Qt snap2

Merged Kali Kaneko requested to merge kali/bitmask-vpn:qt-snap2 into libraries
2 unresolved threads

some commits on top of meskio's rework on snap

Merge request reports

Checking pipeline status.

Approval is optional

Merged by leap-code-o-maticleap-code-o-matic 4 years ago (Sep 25, 2020 2:04pm UTC)

Merge details

  • Changes merged into libraries with 2ecd10ef.
  • Deleted the source branch.

Pipeline #46602 failed

Pipeline failed for 2ecd10ef on libraries

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
2 2 version: ${version}
3 3 summary: ${applicationName}, secure VPN. Powered by Bitmask.
4 4 description: |
5 ${applicationName} is an easy, fast, and secure VPN service from ${providerURL}.
6 ${applicationName} does not require a user account, keep logs, or track you in
7 any way. The service is paid for entirely by donations from users like you.
5 RiseupVPN is an easy, fast, and secure VPN service from riseup.net.
6 RiseupVPN does not require a user account, keep logs, or track you in
  • meskio
    meskio @meskio started a thread on an outdated change in commit 39100e84
  • 33 33 )
    34 34
    35 35 var (
    36 snapOpenvpnPath = "/snap/bin/" + config.BinaryName + ".openvpn"
    37 snapBitmaskRootPath = "/snap/bin/" + config.BinaryName + ".bitmask-root"
    36 // FIXME -- temporary removing dash from binaryName due to snap bug with multipass
    37 /* See https://0xacab.org/leap/bitmask-vpn/-/issues/354 */
    38
    39 //snapOpenvpnPath = "/snap/bin/" + config.BinaryName + ".openvpn"
    40 //snapBitmaskRootPath = "/snap/bin/" + config.BinaryName + ".bitmask-root"
    41 binLower = strings.Replace(strings.ToLower(config.BinaryName), "-", "", -1)
    42
    43 snapOpenvpnPath = "/snap/bin/" + binLower + ".openvpn"
    44 snapBitmaskRootPath = "/snap/bin/" + binLower + ".bitmask-root"
  • Kali Kaneko added 18 commits

    added 18 commits

    • 550458a5...cf8e2827 - 5 commits from branch leap:libraries
    • 45781102 - [pkg] let's get snaps working with our qt build
    • 8dd79bac - [ci] run only the tests and compile in the CI
    • 436d0437 - [ci] build snap image
    • b84dbb2d - [pkg] allow to pass qmake path
    • 103abf08 - [pkg] use qtquick.controls 1
    • bbc227c8 - [pkg] parametrize working snap file
    • 6d234d0e - [pkg] pass target name to the build script
    • a487a307 - [pkg] keep track of efforts to have an usable qt5 static build
    • 6a165ef1 - [pkg] remove call to vendorize
    • c51106f4 - [docs] document params for build
    • f5e3655b - [bug] fix variable in template
    • eb27557a - [test] fix the tests to work with the new vendoring
    • a8e37837 - [ci] use the registry of the repo

    Compare with previous version

  • Kali Kaneko added 1 commit

    added 1 commit

    • 2ecd10ef - [pkg] re-add appname to template, bad merge

    Compare with previous version

  • Please register or sign in to reply
    Loading