Merge pull request #107 from aspiers/improve-dotfiles-fix

aspiers · Apr 7, 2024 · 143dbf8 · 143dbf8
2 parents fee2225 + 94ed916
commit 143dbf8
Show file tree

Hide file tree

Showing 13 changed files with 598 additions and 795 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,8 @@
 /bin/stow
 /doc/stow.info
 /doc/version.texi
-tmp-testing-trees/
+/playground/
+tmp-testing-trees*/
 _build/
 autom4te.cache/
 blib/

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -85,6 +85,11 @@ or to run the whole suite:
 However currently there is an issue where this interferes with
 `TEST_VERBOSE`.
 
+If you want to create test files for experimentation, it is
+recommended to put them in a subdirectory called `playground/` since
+this will be automatically ignored by git and the build process,
+avoiding any undesirable complications.
+
 Translating Stow
 ----------------
 

diff --git a/MANIFEST b/MANIFEST
@@ -50,7 +50,6 @@ t/stow.t
 t/rc_options.t
 t/testutil.pm
 t/unstow.t
-t/unstow_orig.t
 tools/get-version
 THANKS
 TODO

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
@@ -83,16 +83,14 @@
 ^doc/HOWTO-RELEASE$
 
 # Avoid test files
-tmp-testing-trees
-.coveralls.yml
-.github/workflows/
-.travis.yml
+tmp-testing-trees*
+^.coveralls.yml
+^.github/workflows/
+^.travis.yml
 ^docker/
 ^[a-zA-Z]*-docker.sh
+^playground/
 
 # Avoid development config
-.dir-locals.el
-.dumbjump
-
-# Avoid CI
-.github/
+^.dir-locals.el
+^.dumbjump
diff --git a/Makefile.am b/Makefile.am
@@ -51,7 +51,7 @@ DEFAULT_IGNORE_LIST = $(srcdir)/default-ignore-list
 doc_deps = $(info_TEXINFOS) doc/version.texi $(DEFAULT_IGNORE_LIST)
 
 TESTS_DIR = $(srcdir)/t
-TESTS_OUT = tmp-testing-trees
+TESTS_OUT = tmp-testing-trees tmp-testing-trees-compat
 TESTS_ENVIRONMENT = $(PERL) -Ibin -Ilib -I$(TESTS_DIR)
 
 # This is a kind of hack; TESTS needs to be set to ensure that the

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -16,10 +16,9 @@
 # Build docker image: `docker build -t stowtest`
 # Run tests: (from stow src directory)
 #    `docker run --rm -it -v $(pwd):$(pwd) -w $(pwd) stowtest`
-FROM debian:jessie
-RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list
+FROM debian:bookworm
+RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq
 RUN DEBIAN_FRONTEND=noninteractive \
-apt-get update -qq && \
 apt-get install -y -q \
     autoconf \
     bzip2 \