ubuntu-security-tools

Merge ~sespiros/ubuntu-security-tools/+git/ubuntu-security-tools:coverity-snap-update into ubuntu-security-tools:master

  1. Git
  2. lp:~sespiros/ubuntu-security-tools/+git/ubuntu-security-tools
  3. coverity-snap-update
  4. Merge into master
Proposed by Spyros Seimenis
Status: Needs review
Proposed branch: ~sespiros/ubuntu-security-tools/+git/ubuntu-security-tools:coverity-snap-update
Merge into: ubuntu-security-tools:master
Diff against target: 47 lines (+6/-6)
2 files modified
snaps/coverity-ubuntu-security/files/bin/install (+3/-1)
snaps/coverity-ubuntu-security/snapcraft.yaml (+3/-5)
Reviewer Review Type Date Requested Status
Ubuntu Security Team Pending
Review via email: mp+422375@code.launchpad.net
To post a comment you must log in.
~sespiros/ubuntu-security-tools/+git/ubuntu-security-tools:coverity-snap-update updated
8e8bb9f... by Spyros Seimenis

Update coverity version to 2022.06

Unmerged commits

8e8bb9f... by Spyros Seimenis

Update coverity version to 2022.06

67b096a... by Spyros Seimenis

Updated coverity snap to latest version

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snaps/coverity-ubuntu-security/README b/snaps/coverity-ubuntu-security/README.md
2similarity index 100%
3rename from snaps/coverity-ubuntu-security/README
4rename to snaps/coverity-ubuntu-security/README.md
5diff --git a/snaps/coverity-ubuntu-security/files/bin/install b/snaps/coverity-ubuntu-security/files/bin/install
6index 1f030be..e36c875 100755
7--- a/snaps/coverity-ubuntu-security/files/bin/install
8+++ b/snaps/coverity-ubuntu-security/files/bin/install
9@@ -1,7 +1,9 @@
10 #!/bin/sh
11 set -e
12
13-. "$SNAP/bin/common.sh"
14+install_symlink="cov-analysis-current"
15+topdir="$SNAP_USER_COMMON/$install_symlink"
16+bindir="$topdir/bin"
17
18 if [ -z "$SNAP_USER_COMMON" ]; then
19 echo "SNAP_USER_COMMON not set! Aborting"
20diff --git a/snaps/coverity-ubuntu-security/snapcraft.yaml b/snaps/coverity-ubuntu-security/snapcraft.yaml
21index 7df5bfa..87145af 100644
22--- a/snaps/coverity-ubuntu-security/snapcraft.yaml
23+++ b/snaps/coverity-ubuntu-security/snapcraft.yaml
24@@ -1,11 +1,11 @@
25 name: coverity-ubuntu-security
26-version: "2019.03-64"
27+version: "2022.06-64"
28 summary: Coverity packaging for running as a snap
29 description: |
30 Unpack cov-analysis-linux64-YYYY.MM.tar.gz to $SNAP_USER_COMMON with a symlink
31 from $SNAP_USER_COMMON/cov-analysis to
32- $SNAP_USER_COMMON/cov-analysis-linux64-2019.03. Copy license file to
33- $SNAP_USER_COMMON/cov-analysis-linux64-2019.03/bin
34+ $SNAP_USER_COMMON/cov-analysis-linux64-2022.6.0 Copy license file to
35+ $SNAP_USER_COMMON/cov-analysis-linux64-2022.6.0/bin
36 #architectures:
37 #- all
38 grade: devel
39@@ -26,8 +26,6 @@ apps:
40 command: bin/refresh-auth-key
41 plugs:
42 - network-bind
43- cov-build:
44- command: bin/cov-build
45 cov-analyze:
46 command: bin/wrap cov-analyze
47 plugs:

Subscribers

People subscribed via source and target branches