From de9c5ceb7923a896b888656fdd1f1cd238b830e0 Mon Sep 17 00:00:00 2001 From: 1138-4EB <1138-4EB@users.noreply.github.com> Date: Tue, 14 Feb 2017 19:13:00 +0100 Subject: Replace travis-ci matrix with docker containers (#272) * Extract tag declarations from . Rename it to and allow to pass -b (BLD) and -f (PKG_FILE) as arguments. Save tag declarations in , with a different meaning now. Modify <.travis.yml> accordingly. * chmod +x ./dist/buildtest.sh. Can be removed bi changing permissions. * Replace travis builds with docker containers. ubu1404+llvm-3.5, ubu1204+llvm-3.8, ubu+mcode, fed+mcode and fed+llvm Add PKG_DTAG and SHORT_COMMIT after PKG_FILE, to avoid collisions. DOCKER_IMG used to set image to be used in docker build. is enough if the host dir is mounted in the container. Since multiple files are added, content in split to and . Git depth set to 10 in <.travis.yml> * Fix paths lin/linux and win/windows. Remove '_compile'. Revome wrong placed old buildtest. Add conditional builds (3). Leave 2 fixed. --- dist/linux/envs/fedora_llvm.sh | 2 ++ dist/linux/envs/fedora_mcode.sh | 2 ++ dist/linux/envs/ubuntu1204_llvm38.sh | 2 ++ dist/linux/envs/ubuntu1404_llvm35.sh | 2 ++ dist/linux/envs/ubuntu_mcode.sh | 2 ++ 5 files changed, 10 insertions(+) create mode 100644 dist/linux/envs/fedora_llvm.sh create mode 100644 dist/linux/envs/fedora_mcode.sh create mode 100644 dist/linux/envs/ubuntu1204_llvm38.sh create mode 100644 dist/linux/envs/ubuntu1404_llvm35.sh create mode 100644 dist/linux/envs/ubuntu_mcode.sh (limited to 'dist/linux/envs') diff --git a/dist/linux/envs/fedora_llvm.sh b/dist/linux/envs/fedora_llvm.sh new file mode 100644 index 000000000..c44857c51 --- /dev/null +++ b/dist/linux/envs/fedora_llvm.sh @@ -0,0 +1,2 @@ +BLD=fed+llvm +DOCKER_IMG="ghdl/ghdl-tools:fedora-llvm-mcode" \ No newline at end of file diff --git a/dist/linux/envs/fedora_mcode.sh b/dist/linux/envs/fedora_mcode.sh new file mode 100644 index 000000000..3ddb515bf --- /dev/null +++ b/dist/linux/envs/fedora_mcode.sh @@ -0,0 +1,2 @@ +BLD=fed+mcode +DOCKER_IMG="ghdl/ghdl-tools:fedora-llvm-mcode" \ No newline at end of file diff --git a/dist/linux/envs/ubuntu1204_llvm38.sh b/dist/linux/envs/ubuntu1204_llvm38.sh new file mode 100644 index 000000000..5f68d2ab0 --- /dev/null +++ b/dist/linux/envs/ubuntu1204_llvm38.sh @@ -0,0 +1,2 @@ +BLD=ubu1204+llvm-3.8 +DOCKER_IMG="ghdl/ghdl-tools:ubuntu1204-llvm" \ No newline at end of file diff --git a/dist/linux/envs/ubuntu1404_llvm35.sh b/dist/linux/envs/ubuntu1404_llvm35.sh new file mode 100644 index 000000000..bf4baf236 --- /dev/null +++ b/dist/linux/envs/ubuntu1404_llvm35.sh @@ -0,0 +1,2 @@ +BLD=ubu1404+llvm-3.5 +DOCKER_IMG="ghdl/ghdl-tools:ubuntu1404-llvm" \ No newline at end of file diff --git a/dist/linux/envs/ubuntu_mcode.sh b/dist/linux/envs/ubuntu_mcode.sh new file mode 100644 index 000000000..e6f7c3232 --- /dev/null +++ b/dist/linux/envs/ubuntu_mcode.sh @@ -0,0 +1,2 @@ +BLD=ubu+mcode +DOCKER_IMG="ghdl/ghdl-tools:ubuntu-mcode" \ No newline at end of file -- cgit v1.2.3