[Git][reproducible-builds/diffoscope][master] 4 commits: Add Arch Linux as CI test target

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
da8e2a35 by Jelle van der Waa at 2021-10-27T14:57:40+02:00
Add Arch Linux as CI test target

This still ignores one unit test set which fails on Arch Linux and
needs to be further investigated.

- - - - -
52630c75 by Jelle van der Waa at 2021-10-27T14:59:55+02:00
Add external tool on Arch Linux for ffmpeg.

- - - - -
c0d178f5 by Jelle van der Waa at 2021-10-27T14:59:56+02:00
Add external tool on Arch Linux for openssl

- - - - -
ee2fb1e9 by Jelle van der Waa at 2021-10-27T14:59:56+02:00
Add external tool on Arch Linux for ocamlobjinfo

- - - - -


2 changed files:

- .gitlab-ci.yml
- diffoscope/external_tools.py


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -32,6 +32,18 @@ ubuntu-devel:
   image: ubuntu:devel
   allow_failure: true
 
+arch:
+  stage: test
+  allow_failure: true
+  image: archlinux:latest
+  script:
+    - > 
+      pacman -Syu --noconfirm file python-pytest python-pytest-cov python-distro python-libarchive-c python-progressbar
+      python-magic python-setuptools binutils
+    - "pacman -S --noconfirm $(./bin/diffoscope --list-tools|cut -d: -f2 | head -n1 | sed s/,//g)"
+    - mount -o remount,rw /dev
+    - py.test -vv -k 'not test_diff_meta' -l -r a --cov=diffoscope --cov-report=term-missing
+
 .deploy:
   image: docker:latest
   stage: deploy


=====================================
diffoscope/external_tools.py
=====================================
@@ -64,7 +64,7 @@ EXTERNAL_TOOLS = {
         "arch": "dtc",
         "guix": "dtc",
     },
-    "ffprobe": {"debian": "ffmpeg", "guix": "ffmpeg"},
+    "ffprobe": {"debian": "ffmpeg", "arch": "ffmpeg", "guix": "ffmpeg"},
     "file": {"debian": "file", "arch": "file", "guix": "file"},
     "find": {"debian": "findutils", "arch": "findutils", "guix": "findutils"},
     "getfacl": {"debian": "acl", "arch": "acl", "guix": "acl"},
@@ -150,10 +150,10 @@ EXTERNAL_TOOLS = {
         "arch": "binutils",
         "guix": "binutils",
     },
-    "ocamlobjinfo": {"debian": "ocaml-nox", "guix": "ocaml"},
+    "ocamlobjinfo": {"debian": "ocaml-nox", "arch": "ocaml", "guix": "ocaml"},
     "odt2txt": {"debian": "odt2txt", "arch": "odt2txt", "guix": "odt2txt"},
     "oggDump": {"debian": "oggvideotools"},
-    "openssl": {"debian": "openssl", "guix": "openssl"},
+    "openssl": {"debian": "openssl", "arch": "openssl", "guix": "openssl"},
     "otool": {},
     "pgpdump": {"debian": "pgpdump", "arch": "pgpdump", "guix": "pgpdump"},
     "pdftotext": {



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/970d21a2decdb78a2a765115de6eae4cc9a9f141...ee2fb1e9804e997045fb852cdde02c7bd1351aae

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/970d21a2decdb78a2a765115de6eae4cc9a9f141...ee2fb1e9804e997045fb852cdde02c7bd1351aae
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20211027/b6150a57/attachment.htm>