diff options
| author | Tina Müller <cpan2@tinita.de> | 2020-04-17 23:19:19 +0200 |
|---|---|---|
| committer | Tina Müller <cpan2@tinita.de> | 2020-04-18 12:21:20 +0200 |
| commit | a7ac0baa83491117f2ae8f6e00eee8cf6d7992ae (patch) | |
| tree | 4268bea3fa6d654162f929fb22991984f79c465e | |
| parent | 250c276945381e45cf27704878c728399ad84646 (diff) | |
| download | libyaml-git-a7ac0baa83491117f2ae8f6e00eee8cf6d7992ae.tar.gz | |
Add a test-pyyaml target
to test pyyaml master with current libyaml branch
| -rw-r--r-- | README.md | 20 | ||||
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/Makefile | 5 | ||||
| -rwxr-xr-x | docker/scripts/libyaml-test-pyyaml.sh | 30 |
4 files changed, 56 insertions, 3 deletions
@@ -12,21 +12,35 @@ Update libyaml version in: Commit and push everything to release/0.x.y -## Create dist archives +## Test and Create Release archives + +This will create a docker image (libyaml-dev), test libyaml & pyyaml, +and creat archives. Make sure you have a clean git repository (no changed files). The following process will clone your current git directory. +### Run pyyaml tests on release branch + +Run + + cd packaging/docker + make test-pyyaml + +It will run all libyaml tests, and run pyyaml tests (with python 2 & 3) on +the current branch. + +### Create dist archives + Run make docker-dist in the repository root or + cd packaging/docker make libyaml-dist -in packaging/docker. - It will create a docker image (libyaml-dev) and run `make dist` in the container to create a tarball written to packaging/docker/output. It will also create a zipfile. diff --git a/docker/Dockerfile b/docker/Dockerfile index 7d30ae0..1f56e48 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,6 +7,9 @@ RUN apt-get update && \ less \ cmake \ python \ + cython \ + python3 \ + cython3 \ flex \ bison \ automake \ @@ -31,4 +34,5 @@ RUN curl https://sourceforge.net/projects/doxygen/files/rel-1.8.14/doxygen-1.8.1 make install COPY scripts/libyaml-dist.sh /libyaml-dist.sh +COPY scripts/libyaml-test-pyyaml.sh /libyaml-test-pyyaml.sh diff --git a/docker/Makefile b/docker/Makefile index 0fb8d30..d831a83 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -9,3 +9,8 @@ libyaml-dist: build rm -rf output/libyaml.git git clone ../../.git output/libyaml.git docker run -it --rm -u $$(id -u) -v$$PWD/output:/output libyaml-dev ./libyaml-dist.sh + +test-pyyaml: build + rm -rf output/libyaml.git + git clone ../../.git output/libyaml.git + docker run -it --rm -v$$PWD/output:/output libyaml-dev ./libyaml-test-pyyaml.sh diff --git a/docker/scripts/libyaml-test-pyyaml.sh b/docker/scripts/libyaml-test-pyyaml.sh new file mode 100755 index 0000000..694c71d --- /dev/null +++ b/docker/scripts/libyaml-test-pyyaml.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +set -e +set -x + +# Create tarball +cd /tmp +cp -rp /output/libyaml.git . +#git clone https://github.com/yaml/libyaml.git +cd libyaml.git +./bootstrap +./configure +make +make test +make test-all +make install +ldconfig + +cd /tmp +git clone https://github.com/yaml/pyyaml.git +cd pyyaml +python --version +python setup.py test + +echo "python 2 pyyaml successful" + +git clean -xdf +python3 setup.py test + +echo "python 2 & 3 pyyaml successful" |