Skip to content

Commit

Permalink
chore(app-aur): add conflict with nymvpn-x (#1171)
Browse files Browse the repository at this point in the history
  • Loading branch information
doums authored Sep 17, 2024
1 parent f2464c2 commit c620024
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish-aur-nym-vpn-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
required: false
default: false
commit_msg:
description: "Commit message for the AUR repo (default to the release tag)"
description: "Commit message for the AUR repo (default to package version)"
type: string
required: false

Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
commit_username: ${{ secrets.AUR_USERNAME }}
commit_email: ${{ secrets.AUR_EMAIL }}
ssh_private_key: ${{ secrets.AUR_SSH_KEY }}
commit_message: ${{ inputs.commit_msg || inputs.release_tag }}
commit_message: ${{ inputs.commit_msg || format('v{0}', steps.app-version.outputs.metadata) }}
assets: |
nym-vpn-app/.pkg/aur/nym-vpn-wrapper.sh
nym-vpn-app/.pkg/aur/nym-vpn.desktop
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-aur-nym-vpnd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
required: false
default: false
commit_msg:
description: "Commit message for the AUR repo (default to the release tag)"
description: "Commit message for the AUR repo (default to package version)"
type: string
required: false

Expand Down Expand Up @@ -93,6 +93,6 @@ jobs:
commit_username: ${{ secrets.AUR_USERNAME }}
commit_email: ${{ secrets.AUR_EMAIL }}
ssh_private_key: ${{ secrets.AUR_SSH_KEY }}
commit_message: ${{ inputs.commit_msg || inputs.release_tag }}
commit_message: ${{ inputs.commit_msg || format('v{0}', steps.app-version.outputs.metadata) }}
assets: |
nym-vpn-core/crates/nym-vpnd/.pkg/aur/nym-vpnd.service
2 changes: 1 addition & 1 deletion nym-vpn-app/.pkg/aur/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ depends=('gcc-libs' 'bash' 'cairo' 'gtk3' 'webkit2gtk-4.1' 'gdk-pixbuf2' 'glib2'
makedepends=('rust' 'cargo' 'protobuf' 'npm')
optdepends=('nym-vpnd: NymVPN daemon as a systemd service')
provides=('nym-vpn-app')
conflicts=('nym-vpn-app')
conflicts=('nymvpn-x' 'nym-vpn-app')
options=(!debug)
source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$_release_tag.tar.gz"
'nym-vpn-wrapper.sh'
Expand Down
2 changes: 1 addition & 1 deletion nym-vpn-app/.pkg/aur/PKGBUILD-bin
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ depends=('gcc-libs' 'bash' 'cairo' 'gtk3' 'webkit2gtk-4.1' 'gdk-pixbuf2' 'glib2'
makedepends=()
optdepends=('nym-vpnd: NymVPN daemon as a systemd service')
provides=('nym-vpn-app')
conflicts=('nym-vpn-app')
conflicts=('nymvpn-x' 'nym-vpn-app')
options=(!debug)
source=("$url/releases/download/$_release_tag/nym-vpn_${_pkgver}_linux_x64"
'nym-vpn-wrapper.sh'
Expand Down

0 comments on commit c620024

Please sign in to comment.