Skip to content

Commit bca5b1c

Browse files
Ben ComanBen Coman
Ben Coman
authored and
Ben Coman
committed
Simplify gitignore build directories
1 parent 0fae80c commit bca5b1c

File tree

2 files changed

+109
-135
lines changed

2 files changed

+109
-135
lines changed

‎.gitignore

+8-35
Original file line numberDiff line numberDiff line change
@@ -21,41 +21,14 @@
2121

2222
platforms/unix/config/autom4te.cache/
2323

24-
# Don't track build directories
25-
/build*/**/*
26-
# except do track these files
27-
!branding.gmk
28-
!branding-sed-rules.gmk
29-
!conf.COG
30-
!conf.COG.dbg
31-
!Croquet.def.in
32-
!Croquet.exe.manifest
33-
!Croquet.ico
34-
!Croquet.rc
35-
!GreenCogSqueak.ico
36-
!HowToBuild
37-
!makeall
38-
!makeallclean
39-
!makealldirty
40-
!makeclean
41-
!makeem
42-
!Makefile
43-
!Makefile.plugin
44-
!Makefile.rules
45-
!Makefile.tools
46-
!makeproduct
47-
!makeproductclean
48-
!mkNamedPrims.sh
49-
!mvm
50-
!NotYetImplemented
51-
!plugins.ext
52-
!plugins.int
53-
!Squeak.def.in
54-
!Squeak.exe.manifest
55-
!squeak.ico
56-
!Squeak.rc
57-
!editnewspeakinstall.sh
58-
!/build.linux32ARMv6/asasm
24+
# Track build config files, e.g. /build.platform/dialect.type.mem/files
25+
# but not build directories, e.g. /build.platform/dialect.type.mem/build_directory/
26+
# distiguished by trailing slash
27+
/build*/*/*/
28+
# except specially exclude a few generated files mixed with config files
29+
/build*/*/LOG*
30+
/build*/*/mkNamedPrims.exe
31+
/build*/*/sqNamedPrims.h
5932

6033
# Ignore special Cadence-only build directories
6134
/build*/glue*

‎.travis.yml

+101-100
Original file line numberDiff line numberDiff line change
@@ -27,106 +27,107 @@ notifications:
2727
jobs:
2828
fast_finish: true
2929
include:
30-
- stage: "Main Squeak and Pharo builds"
31-
env: ARCH="linux32x86" FLAVOR="squeak.cog.spur"
32-
- env: ARCH="macos32x86" FLAVOR="squeak.cog.spur"
33-
<<: *mac-build
34-
- env: ARCH="linux64x64" FLAVOR="squeak.cog.spur"
35-
- env: ARCH="macos64x64" FLAVOR="squeak.cog.spur"
36-
<<: *mac-build
37-
- env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
38-
- env: ARCH="macos32x86" FLAVOR="pharo.cog.spur"
39-
<<: *mac-build
40-
- env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
41-
- env: ARCH="macos64x64" FLAVOR="pharo.cog.spur"
42-
<<: *mac-build
43-
44-
- stage: "Other Linux builds"
45-
env: ARCH="linux64x64" FLAVOR="newspeak.cog.spur"
46-
- env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
47-
# - env: ARCH="linux64x64" FLAVOR="pharo.sista.spur" HEARTBEAT="threaded"
48-
- env: ARCH="linux32x86" FLAVOR="newspeak.cog.spur"
49-
- env: ARCH="linux32x86" FLAVOR="squeak.cog.v3"
50-
- env: ARCH="linux32x86" FLAVOR="squeak.sista.spur"
51-
- env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
52-
- env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="threaded"
53-
compiler: clang
54-
- env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="itimer"
55-
compiler: clang
56-
57-
- stage: "Other Mac builds"
58-
env: ARCH="macos64x64" FLAVOR="newspeak.cog.spur"
59-
<<: *mac-build
60-
# - env: ARCH="macos64x64" FLAVOR="pharo.sista.spur"
61-
# <<: *mac-build
62-
- env: ARCH="macos64x64" FLAVOR="pharo.cog.spur.lowcode"
63-
<<: *mac-build
64-
- env: ARCH="macos32x86" FLAVOR="newspeak.cog.spur"
65-
<<: *mac-build
66-
- env: ARCH="macos32x86" FLAVOR="pharo.sista.spur"
67-
<<: *mac-build
68-
- env: ARCH="macos32x86" FLAVOR="pharo.cog.spur.lowcode"
69-
<<: *mac-build
70-
- env: ARCH="macos32x86" FLAVOR="squeak.cog.v3"
71-
<<: *mac-build
72-
- env: ARCH="macos32x86" FLAVOR="squeak.sista.spur"
73-
<<: *mac-build
74-
75-
- stage: "Stack builds"
76-
env: ARCH="linux64x64" FLAVOR="newspeak.stack.spur"
77-
- env: ARCH="linux64x64" FLAVOR="squeak.stack.spur"
78-
- env: ARCH="linux32x86" FLAVOR="newspeak.stack.spur"
79-
- env: ARCH="linux32x86" FLAVOR="squeak.stack.spur"
80-
- env: ARCH="linux32x86" FLAVOR="squeak.stack.v3"
81-
- env: ARCH="macos64x64" FLAVOR="pharo.stack.spur"
82-
<<: *mac-build
83-
- env: ARCH="macos64x64" FLAVOR="pharo.stack.spur.lowcode"
84-
<<: *mac-build
85-
- env: ARCH="macos64x64" FLAVOR="squeak.stack.spur"
86-
<<: *mac-build
87-
- env: ARCH="macos32x86" FLAVOR="newspeak.stack.spur"
88-
<<: *mac-build
89-
- env: ARCH="macos64x64" FLAVOR="newspeak.stack.spur"
90-
<<: *mac-build
91-
- env: ARCH="macos32x86" FLAVOR="pharo.stack.spur"
92-
<<: *mac-build
93-
- env: ARCH="macos32x86" FLAVOR="pharo.stack.spur.lowcode"
94-
<<: *mac-build
95-
- env: ARCH="macos32x86" FLAVOR="squeak.stack.spur"
96-
<<: *mac-build
97-
- env: ARCH="macos32x86" FLAVOR="squeak.stack.v3"
98-
<<: *mac-build
99-
100-
- stage: "linux32ARMv6 builds"
101-
env: ARCH="linux32ARMv6" FLAVOR="newspeak.cog.spur" CHROOT="schroot -p -c rpi
102-
-- bash -c "
103-
dist: trusty
104-
group: edge
105-
- env: ARCH="linux32ARMv6" FLAVOR="newspeak.stack.spur" CHROOT="schroot -p -c rpi
106-
-- bash -c "
107-
dist: trusty
108-
group: edge
109-
- env: ARCH="linux32ARMv6" FLAVOR="squeak.cog.spur" CHROOT="schroot -p -c rpi --
110-
bash -c "
111-
dist: trusty
112-
group: edge
113-
- env: ARCH="linux32ARMv6" FLAVOR="pharo.cog.spur" CHROOT="schroot -p -c rpi --
114-
bash -c "
115-
dist: trusty
116-
group: edge
117-
- env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.spur" CHROOT="schroot -p -c rpi
118-
-- bash -c "
119-
dist: trusty
120-
group: edge
121-
- env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.v3" CHROOT="schroot -p -c rpi --
122-
bash -c "
123-
dist: trusty
124-
group: edge
125-
allow_failures:
126-
- env: FLAVOR="squeak.sista.spur"
127-
- env: FLAVOR="pharo.sista.spur"
128-
- env: FLAVOR="squeak.cog.spur.lowcode"
129-
- env: FLAVOR="pharo.cog.spur.lowcode"
30+
# - stage: "Main Squeak and Pharo builds"
31+
# env: ARCH="linux32x86" FLAVOR="squeak.cog.spur"
32+
# - env: ARCH="macos32x86" FLAVOR="squeak.cog.spur"
33+
# <<: *mac-build
34+
# - env: ARCH="linux64x64" FLAVOR="squeak.cog.spur"
35+
# - env: ARCH="macos64x64" FLAVOR="squeak.cog.spur"
36+
# <<: *mac-build
37+
# - env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
38+
# - env: ARCH="macos32x86" FLAVOR="pharo.cog.spur"
39+
# <<: *mac-build
40+
# - env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
41+
# - env: ARCH="macos64x64" FLAVOR="pharo.cog.spur"
42+
# <<: *mac-build
43+
44+
# - stage: "Other Linux builds"
45+
# env: ARCH="linux64x64" FLAVOR="newspeak.cog.spur"
46+
# - env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
47+
# # - env: ARCH="linux64x64" FLAVOR="pharo.sista.spur" HEARTBEAT="threaded"
48+
# - env: ARCH="linux32x86" FLAVOR="newspeak.cog.spur"
49+
# - env: ARCH="linux32x86" FLAVOR="squeak.cog.v3"
50+
# - env: ARCH="linux32x86" FLAVOR="squeak.sista.spur"
51+
# - env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
52+
# - env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="threaded"
53+
# compiler: clang
54+
# - env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="itimer"
55+
# compiler: clang
56+
57+
# - stage: "Other Mac builds"
58+
# env: ARCH="macos64x64" FLAVOR="newspeak.cog.spur"
59+
# <<: *mac-build
60+
# # - env: ARCH="macos64x64" FLAVOR="pharo.sista.spur"
61+
# # <<: *mac-build
62+
# - env: ARCH="macos64x64" FLAVOR="pharo.cog.spur.lowcode"
63+
# <<: *mac-build
64+
# - env: ARCH="macos32x86" FLAVOR="newspeak.cog.spur"
65+
# <<: *mac-build
66+
# - env: ARCH="macos32x86" FLAVOR="pharo.sista.spur"
67+
# <<: *mac-build
68+
# - env: ARCH="macos32x86" FLAVOR="pharo.cog.spur.lowcode"
69+
# <<: *mac-build
70+
# - env: ARCH="macos32x86" FLAVOR="squeak.cog.v3"
71+
# <<: *mac-build
72+
# - env: ARCH="macos32x86" FLAVOR="squeak.sista.spur"
73+
# <<: *mac-build
74+
#
75+
# - stage: "Stack builds"
76+
env: ARCH="build.mingw32x86-on-linux" FLAVOR="squeak.stack.spur"
77+
# env: ARCH="linux64x64" FLAVOR="newspeak.stack.spur"
78+
# - env: ARCH="linux64x64" FLAVOR="squeak.stack.spur"
79+
# - env: ARCH="linux32x86" FLAVOR="newspeak.stack.spur"
80+
# - env: ARCH="linux32x86" FLAVOR="squeak.stack.spur"
81+
# - env: ARCH="linux32x86" FLAVOR="squeak.stack.v3"
82+
# - env: ARCH="macos64x64" FLAVOR="pharo.stack.spur"
83+
# <<: *mac-build
84+
# - env: ARCH="macos64x64" FLAVOR="pharo.stack.spur.lowcode"
85+
# <<: *mac-build
86+
# - env: ARCH="macos64x64" FLAVOR="squeak.stack.spur"
87+
# <<: *mac-build
88+
# - env: ARCH="macos32x86" FLAVOR="newspeak.stack.spur"
89+
# <<: *mac-build
90+
# - env: ARCH="macos64x64" FLAVOR="newspeak.stack.spur"
91+
# <<: *mac-build
92+
# - env: ARCH="macos32x86" FLAVOR="pharo.stack.spur"
93+
# <<: *mac-build
94+
# - env: ARCH="macos32x86" FLAVOR="pharo.stack.spur.lowcode"
95+
# <<: *mac-build
96+
# - env: ARCH="macos32x86" FLAVOR="squeak.stack.spur"
97+
# <<: *mac-build
98+
# - env: ARCH="macos32x86" FLAVOR="squeak.stack.v3"
99+
# <<: *mac-build
100+
#
101+
# - stage: "linux32ARMv6 builds"
102+
# env: ARCH="linux32ARMv6" FLAVOR="newspeak.cog.spur" CHROOT="schroot -p -c rpi
103+
# -- bash -c "
104+
# dist: trusty
105+
# group: edge
106+
# - env: ARCH="linux32ARMv6" FLAVOR="newspeak.stack.spur" CHROOT="schroot -p -c rpi
107+
# -- bash -c "
108+
# dist: trusty
109+
# group: edge
110+
# - env: ARCH="linux32ARMv6" FLAVOR="squeak.cog.spur" CHROOT="schroot -p -c rpi --
111+
# bash -c "
112+
# dist: trusty
113+
# group: edge
114+
# - env: ARCH="linux32ARMv6" FLAVOR="pharo.cog.spur" CHROOT="schroot -p -c rpi --
115+
# bash -c "
116+
# dist: trusty
117+
# group: edge
118+
# - env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.spur" CHROOT="schroot -p -c rpi
119+
# -- bash -c "
120+
# dist: trusty
121+
# group: edge
122+
# - env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.v3" CHROOT="schroot -p -c rpi --
123+
# bash -c "
124+
# dist: trusty
125+
# group: edge
126+
# allow_failures:
127+
# - env: FLAVOR="squeak.sista.spur"
128+
# - env: FLAVOR="pharo.sista.spur"
129+
# - env: FLAVOR="squeak.cog.spur.lowcode"
130+
# - env: FLAVOR="pharo.cog.spur.lowcode"
130131

131132
install: ./scripts/ci/travis_install.sh
132133

0 commit comments

Comments
 (0)