Simplify gitignore build directories

OpenSmalltalk · Jan 8, 2019 · bca5b1c · bca5b1c
1 parent 0fae80c
commit bca5b1c
Show file tree

Hide file tree

Showing 2 changed files with 109 additions and 135 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,41 +21,14 @@
 
 platforms/unix/config/autom4te.cache/
 
-# Don't track build directories 
-/build*/**/*
-# except do track these files
-!branding.gmk
-!branding-sed-rules.gmk
-!conf.COG
-!conf.COG.dbg
-!Croquet.def.in
-!Croquet.exe.manifest
-!Croquet.ico
-!Croquet.rc
-!GreenCogSqueak.ico
-!HowToBuild
-!makeall
-!makeallclean
-!makealldirty
-!makeclean
-!makeem
-!Makefile
-!Makefile.plugin
-!Makefile.rules
-!Makefile.tools
-!makeproduct
-!makeproductclean
-!mkNamedPrims.sh
-!mvm
-!NotYetImplemented
-!plugins.ext
-!plugins.int
-!Squeak.def.in
-!Squeak.exe.manifest
-!squeak.ico
-!Squeak.rc
-!editnewspeakinstall.sh
-!/build.linux32ARMv6/asasm
+# Track build config files,  e.g. /build.platform/dialect.type.mem/files
+# but not build directories, e.g. /build.platform/dialect.type.mem/build_directory/
+# distiguished by trailing slash
+/build*/*/*/
+# except specially exclude a few generated files mixed with config files
+/build*/*/LOG*
+/build*/*/mkNamedPrims.exe
+/build*/*/sqNamedPrims.h
 
 # Ignore special Cadence-only build directories
 /build*/glue*

diff --git a/.travis.yml b/.travis.yml
@@ -27,106 +27,107 @@ notifications:
 jobs:
   fast_finish: true
   include:
-  - stage: "Main Squeak and Pharo builds"
-    env: ARCH="linux32x86" FLAVOR="squeak.cog.spur"
-  - env: ARCH="macos32x86" FLAVOR="squeak.cog.spur"
-    <<: *mac-build
-  - env: ARCH="linux64x64" FLAVOR="squeak.cog.spur"
-  - env: ARCH="macos64x64" FLAVOR="squeak.cog.spur"
-    <<: *mac-build
-  - env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
-  - env: ARCH="macos32x86" FLAVOR="pharo.cog.spur"
-    <<: *mac-build
-  - env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
-  - env: ARCH="macos64x64" FLAVOR="pharo.cog.spur"
-    <<: *mac-build
-
-  - stage: "Other Linux builds"
-    env: ARCH="linux64x64" FLAVOR="newspeak.cog.spur"
-  - env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
-  # - env: ARCH="linux64x64" FLAVOR="pharo.sista.spur" HEARTBEAT="threaded"
-  - env: ARCH="linux32x86" FLAVOR="newspeak.cog.spur"
-  - env: ARCH="linux32x86" FLAVOR="squeak.cog.v3"
-  - env: ARCH="linux32x86" FLAVOR="squeak.sista.spur"
-  - env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
-  - env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="threaded"
-    compiler: clang
-  - env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="itimer" 
-    compiler: clang
-
-  - stage: "Other Mac builds"
-    env: ARCH="macos64x64" FLAVOR="newspeak.cog.spur"
-    <<: *mac-build
-  # - env: ARCH="macos64x64" FLAVOR="pharo.sista.spur"
-  #   <<: *mac-build
-  - env: ARCH="macos64x64" FLAVOR="pharo.cog.spur.lowcode"
-    <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="newspeak.cog.spur"
-    <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="pharo.sista.spur"
-    <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="pharo.cog.spur.lowcode"
-    <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="squeak.cog.v3"
-    <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="squeak.sista.spur"
-    <<: *mac-build
-
-  - stage: "Stack builds"
-    env: ARCH="linux64x64" FLAVOR="newspeak.stack.spur"
-  - env: ARCH="linux64x64" FLAVOR="squeak.stack.spur"
-  - env: ARCH="linux32x86" FLAVOR="newspeak.stack.spur"
-  - env: ARCH="linux32x86" FLAVOR="squeak.stack.spur"
-  - env: ARCH="linux32x86" FLAVOR="squeak.stack.v3"
-  - env: ARCH="macos64x64" FLAVOR="pharo.stack.spur"
-    <<: *mac-build
-  - env: ARCH="macos64x64" FLAVOR="pharo.stack.spur.lowcode"
-    <<: *mac-build
-  - env: ARCH="macos64x64" FLAVOR="squeak.stack.spur"
-    <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="newspeak.stack.spur"
-    <<: *mac-build
-  - env: ARCH="macos64x64" FLAVOR="newspeak.stack.spur"
-    <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="pharo.stack.spur"
-    <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="pharo.stack.spur.lowcode"
-    <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="squeak.stack.spur"
-    <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="squeak.stack.v3"
-    <<: *mac-build
-
-  - stage: "linux32ARMv6 builds"
-    env: ARCH="linux32ARMv6" FLAVOR="newspeak.cog.spur" CHROOT="schroot -p -c rpi
-      -- bash -c "
-    dist: trusty
-    group: edge
-  - env: ARCH="linux32ARMv6" FLAVOR="newspeak.stack.spur" CHROOT="schroot -p -c rpi
-      -- bash -c "
-    dist: trusty
-    group: edge
-  - env: ARCH="linux32ARMv6" FLAVOR="squeak.cog.spur" CHROOT="schroot -p -c rpi --
-      bash -c "
-    dist: trusty
-    group: edge
-  - env: ARCH="linux32ARMv6" FLAVOR="pharo.cog.spur" CHROOT="schroot -p -c rpi --
-      bash -c "
-    dist: trusty
-    group: edge
-  - env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.spur" CHROOT="schroot -p -c rpi
-      -- bash -c "
-    dist: trusty
-    group: edge
-  - env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.v3" CHROOT="schroot -p -c rpi --
-      bash -c "
-    dist: trusty
-    group: edge
-  allow_failures:
-  - env: FLAVOR="squeak.sista.spur"
-  - env: FLAVOR="pharo.sista.spur"
-  - env: FLAVOR="squeak.cog.spur.lowcode"
-  - env: FLAVOR="pharo.cog.spur.lowcode"
+#  - stage: "Main Squeak and Pharo builds"
+#    env: ARCH="linux32x86" FLAVOR="squeak.cog.spur"
+#  - env: ARCH="macos32x86" FLAVOR="squeak.cog.spur"
+#    <<: *mac-build
+#  - env: ARCH="linux64x64" FLAVOR="squeak.cog.spur"
+#  - env: ARCH="macos64x64" FLAVOR="squeak.cog.spur"
+#    <<: *mac-build
+#  - env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
+#  - env: ARCH="macos32x86" FLAVOR="pharo.cog.spur"
+#    <<: *mac-build
+#  - env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
+#  - env: ARCH="macos64x64" FLAVOR="pharo.cog.spur"
+#    <<: *mac-build
+
+#  - stage: "Other Linux builds"
+#    env: ARCH="linux64x64" FLAVOR="newspeak.cog.spur"
+#  - env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
+#  # - env: ARCH="linux64x64" FLAVOR="pharo.sista.spur" HEARTBEAT="threaded"
+#  - env: ARCH="linux32x86" FLAVOR="newspeak.cog.spur"
+#  - env: ARCH="linux32x86" FLAVOR="squeak.cog.v3"
+#  - env: ARCH="linux32x86" FLAVOR="squeak.sista.spur"
+#  - env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
+#  - env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="threaded"
+#    compiler: clang
+#  - env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="itimer" 
+#    compiler: clang
+
+#  - stage: "Other Mac builds"
+#    env: ARCH="macos64x64" FLAVOR="newspeak.cog.spur"
+#    <<: *mac-build
+#  # - env: ARCH="macos64x64" FLAVOR="pharo.sista.spur"
+#  #   <<: *mac-build
+#  - env: ARCH="macos64x64" FLAVOR="pharo.cog.spur.lowcode"
+#    <<: *mac-build
+#  - env: ARCH="macos32x86" FLAVOR="newspeak.cog.spur"
+#    <<: *mac-build
+#  - env: ARCH="macos32x86" FLAVOR="pharo.sista.spur"
+#    <<: *mac-build
+#  - env: ARCH="macos32x86" FLAVOR="pharo.cog.spur.lowcode"
+#    <<: *mac-build
+#  - env: ARCH="macos32x86" FLAVOR="squeak.cog.v3"
+#    <<: *mac-build
+#  - env: ARCH="macos32x86" FLAVOR="squeak.sista.spur"
+#    <<: *mac-build
+#
+#  - stage: "Stack builds"
+    env: ARCH="build.mingw32x86-on-linux" FLAVOR="squeak.stack.spur"
+#    env: ARCH="linux64x64" FLAVOR="newspeak.stack.spur"
+#  - env: ARCH="linux64x64" FLAVOR="squeak.stack.spur"
+#  - env: ARCH="linux32x86" FLAVOR="newspeak.stack.spur"
+#  - env: ARCH="linux32x86" FLAVOR="squeak.stack.spur"
+#  - env: ARCH="linux32x86" FLAVOR="squeak.stack.v3"
+#  - env: ARCH="macos64x64" FLAVOR="pharo.stack.spur"
+#    <<: *mac-build
+#  - env: ARCH="macos64x64" FLAVOR="pharo.stack.spur.lowcode"
+#    <<: *mac-build
+#  - env: ARCH="macos64x64" FLAVOR="squeak.stack.spur"
+#    <<: *mac-build
+#  - env: ARCH="macos32x86" FLAVOR="newspeak.stack.spur"
+#    <<: *mac-build
+#  - env: ARCH="macos64x64" FLAVOR="newspeak.stack.spur"
+#    <<: *mac-build
+#  - env: ARCH="macos32x86" FLAVOR="pharo.stack.spur"
+#    <<: *mac-build
+#  - env: ARCH="macos32x86" FLAVOR="pharo.stack.spur.lowcode"
+#    <<: *mac-build
+#  - env: ARCH="macos32x86" FLAVOR="squeak.stack.spur"
+#    <<: *mac-build
+#  - env: ARCH="macos32x86" FLAVOR="squeak.stack.v3"
+#    <<: *mac-build
+#
+#  - stage: "linux32ARMv6 builds"
+#    env: ARCH="linux32ARMv6" FLAVOR="newspeak.cog.spur" CHROOT="schroot -p -c rpi
+#      -- bash -c "
+#    dist: trusty
+#    group: edge
+#  - env: ARCH="linux32ARMv6" FLAVOR="newspeak.stack.spur" CHROOT="schroot -p -c rpi
+#      -- bash -c "
+#    dist: trusty
+#    group: edge
+#  - env: ARCH="linux32ARMv6" FLAVOR="squeak.cog.spur" CHROOT="schroot -p -c rpi --
+#      bash -c "
+#    dist: trusty
+#    group: edge
+#  - env: ARCH="linux32ARMv6" FLAVOR="pharo.cog.spur" CHROOT="schroot -p -c rpi --
+#      bash -c "
+#    dist: trusty
+#    group: edge
+#  - env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.spur" CHROOT="schroot -p -c rpi
+#      -- bash -c "
+#    dist: trusty
+#    group: edge
+#  - env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.v3" CHROOT="schroot -p -c rpi --
+#      bash -c "
+#    dist: trusty
+#    group: edge
+#  allow_failures:
+#  - env: FLAVOR="squeak.sista.spur"
+#  - env: FLAVOR="pharo.sista.spur"
+#  - env: FLAVOR="squeak.cog.spur.lowcode"
+#  - env: FLAVOR="pharo.cog.spur.lowcode"
 
 install: ./scripts/ci/travis_install.sh