From 90b6778e3cbcef05d9bff39c139c05599d6aafba Mon Sep 17 00:00:00 2001 From: rbasso Date: Mon, 28 Nov 2016 21:19:34 +0900 Subject: [PATCH 1/3] common: Add folder with common exercise's files Create a folder to hold files that are common to all exercises. - Add `common` folder to ignore section of `config.json`. - Add `stack.yaml` to the new folder. --- common/stack.yaml | 1 + config.json | 1 + 2 files changed, 2 insertions(+) create mode 100644 common/stack.yaml diff --git a/common/stack.yaml b/common/stack.yaml new file mode 100644 index 000000000..315f4bd5f --- /dev/null +++ b/common/stack.yaml @@ -0,0 +1 @@ +resolver: lts-7.9 diff --git a/config.json b/config.json index 8e5df4451..2e9b56e54 100644 --- a/config.json +++ b/config.json @@ -439,6 +439,7 @@ "trinary" ], "ignored": [ + "common", "docs", "img" ], From 1f31e11b07a99565ea647eb8aa74cdcd099143e6 Mon Sep 17 00:00:00 2001 From: rbasso Date: Mon, 28 Nov 2016 21:50:26 +0900 Subject: [PATCH 2/3] travis: Fix `.travis.yml` to dereference links When copying files before testing, `cp` copies the symbolic links instead of the target files. This adds `-L` so that relative symbolic links will not break building the tests in Travis-CI. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 045b521f2..33ee30fd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,7 +62,7 @@ script: buildfolder="${TRAVIS_BUILD_DIR}/build/${exercisename}/${examplename}" mkdir -p "${buildfolder}" - cp -r stack.yaml test ${example}/* "${buildfolder}" + cp -rL stack.yaml test ${example}/* "${buildfolder}" pushd $buildfolder From 29b428a58a15797d2a75ba28b95469312f9cfccf Mon Sep 17 00:00:00 2001 From: rbasso Date: Mon, 28 Nov 2016 21:31:16 +0900 Subject: [PATCH 3/3] pov: Symbolic link stack.yaml --- exercises/pov/stack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 120000 exercises/pov/stack.yaml diff --git a/exercises/pov/stack.yaml b/exercises/pov/stack.yaml deleted file mode 100644 index 315f4bd5f..000000000 --- a/exercises/pov/stack.yaml +++ /dev/null @@ -1 +0,0 @@ -resolver: lts-7.9 diff --git a/exercises/pov/stack.yaml b/exercises/pov/stack.yaml new file mode 120000 index 000000000..ca3a04adf --- /dev/null +++ b/exercises/pov/stack.yaml @@ -0,0 +1 @@ +../../common/stack.yaml \ No newline at end of file