summaryrefslogtreecommitdiff
diff options
authorOlivier Tilloy <olivier.tilloy@canonical.com>2021-11-28 22:30:23 +0100
committerOlivier Tilloy <olivier.tilloy@canonical.com>2021-11-28 22:30:23 +0100
commitcf72f624cd5d722eb6ceae1ecfc9feffd4a3e1e4 (patch)
treee5f8fe0e3fb8d181662d0f72efea97059dcb04d4
parent88fb34287eb174a6ba63cb68949b215503c3ad39 (diff)
Remove an old plug that was removed from the chromium-ffmpeg snap.
-rwxr-xr-xchromium-ffmpeg-test.sh2
-rw-r--r--snapcraft.yaml6
2 files changed, 1 insertions, 7 deletions
diff --git a/chromium-ffmpeg-test.sh b/chromium-ffmpeg-test.sh
index 4aa53b7..9477ffd 100755
--- a/chromium-ffmpeg-test.sh
+++ b/chromium-ffmpeg-test.sh
@@ -2,7 +2,7 @@
set -eux
-VERSIONS="95241 98516 103551 104195"
+VERSIONS="98516 103551 104195"
for V in $VERSIONS; do
LIBFFMPEGSO=$SNAP/chromium-ffmpeg-$V/chromium-ffmpeg/libffmpeg.so
[[ -f $LIBFFMPEGSO ]]
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 12005aa..acf885e 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -6,7 +6,6 @@ description: |
To run the tests:
snap install chromium-ffmpeg
snap install chromium-ffmpeg-test --beta
- snap connect chromium-ffmpeg-test:chromium-ffmpeg-95241 chromium-ffmpeg:chromium-ffmpeg-95241
snap connect chromium-ffmpeg-test:chromium-ffmpeg-98516 chromium-ffmpeg:chromium-ffmpeg-98516
snap connect chromium-ffmpeg-test:chromium-ffmpeg-103551 chromium-ffmpeg:chromium-ffmpeg-103551
snap connect chromium-ffmpeg-test:chromium-ffmpeg-104195 chromium-ffmpeg:chromium-ffmpeg-104195
@@ -15,10 +14,6 @@ description: |
confinement: strict
plugs:
- chromium-ffmpeg-95241:
- interface: content
- target: $SNAP/chromium-ffmpeg-95241
- default-provider: chromium-ffmpeg
chromium-ffmpeg-98516:
interface: content
target: $SNAP/chromium-ffmpeg-98516
@@ -43,7 +38,6 @@ parts:
override-prime: |
set -eux
cp $SNAPCRAFT_PART_SRC/chromium-ffmpeg-test.sh ./
- mkdir -p chromium-ffmpeg-95241
mkdir -p chromium-ffmpeg-98516
mkdir -p chromium-ffmpeg-103551
mkdir -p chromium-ffmpeg-104195