Move packagecore config, update matrix

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9806c6b4259fd9425fd17404d08819d4c949a0d0..b149c9b9e104433da0206d7c29048184bb05b723 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -69,7 +69,7 @@ jobs:
             # Use latest installed python3 from pyenv
             export PYENV_VERSION="$(pyenv versions | grep -Po '\b3\.\d+\.\d+' | tail -1)"
             pip install packagecore
-            packagecore -o ./dist/ ${CIRCLE_TAG#v}
+            packagecore -c misc/packagecore/packagecore.yaml -o ./dist/ ${CIRCLE_TAG#v}
             # Move source pack to dist
             mv ../${CIRCLE_PROJECT_REPONAME}-${CIRCLE_TAG}.tar.gz dist/
 

diff --git a/README.md b/README.md
index 09d8012ff4e99cca260f1c2ddbc0a852dc5ae379..173f159d85c9e97c6374fb6fd835810de3bb4253 100644 (file)
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ It runs smoothly on the Raspberry Pi, Termux on Android, Linux, macOS, BSD, Cygw
   - Spawn a shell, run apps, run commands, execute file
   - Lock terminal (needs a locker)
 - Minimal deps, minimal config
-- Available on many package managers
+- Widely available
 - Unicode support
 - Follows Linux kernel coding style
 - Highly optimized, static analysis integrated code

diff --git a/packagecore.yaml b/misc/packagecore/packagecore.yaml
similarity index 70%
rename from packagecore.yaml
rename to misc/packagecore/packagecore.yaml
index 27b29cdece3f2dda76030294559b3cf6cf2f7bdc..438a0a5b608f74974b86c3912fdb08ac761bd1a7 100644 (file)
--- a/packagecore.yaml
+++ b/misc/packagecore/packagecore.yaml
@@ -16,19 +16,6 @@ packages:
       - ncurses
       - readline
     container: "archlinux/base"
-  centos7.4:
-    builddeps:
-      - make
-      - gcc
-      - pkgconfig
-      - ncurses-devel
-      - readline-devel
-    deps:
-      - ncurses
-      - readline
-    commands:
-      pre:
-        - yum install epel-release
   centos7.5:
     builddeps:
       - make
@@ -65,46 +52,16 @@ packages:
     deps:
       - libncursesw5
       - readline-common
-  fedora25:
-    builddeps:
-      - make
-      - gcc
-      - pkgconfig
-      - ncurses-devel
-      - readline-devel
-    deps:
-      - ncurses
-      - readline
-  fedora26:
+  debian10:
     builddeps:
       - make
       - gcc
       - pkg-config
-      - ncurses-devel
-      - readline-devel
-    deps:
-      - ncurses
-      - readline
-  fedora27:
-    builddeps:
-      - make
-      - gcc
-      - pkg-config
-      - ncurses-devel
-      - readline-devel
-    deps:
-      - ncurses
-      - readline
-  fedora28:
-    builddeps:
-      - make
-      - gcc
-      - pkg-config
-      - ncurses-devel
-      - readline-devel
+      - libncursesw5-dev
+      - libreadline-dev
     deps:
-      - ncurses
-      - readline
+      - libncursesw5
+      - readline-common
   fedora29:
     builddeps:
       - make