Skip to content

Commit f920855

Browse files
committed
Fix Omnibus builds when Git's fsmonitor is enabled
1 parent 346ce3d commit f920855

5 files changed

Lines changed: 11 additions & 4 deletions

File tree

omnibus/config/software/datadog-agent.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,13 @@
3232

3333
source path: '..',
3434
options: {
35-
exclude: ["**/.cache/**/*", "**/testdata/**/*"],
35+
exclude: [
36+
"**/.cache/**/*",
37+
"**/testdata/**/*",
38+
# Git's fsmonitor daemon creates a Unix socket that breaks builds both
39+
# on the host and in a container with a bind-mounted repo.
40+
"**/.git/fsmonitor--daemon.ipc",
41+
],
3642
}
3743
relative_path 'src/github.com/DataDog/datadog-agent'
3844

omnibus/config/software/datadog-dogstatsd.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
source path: '..',
1212
options: {
13-
exclude: ["**/.cache/**/*"],
13+
exclude: ["**/.cache/**/*", "**/.git/fsmonitor--daemon.ipc"],
1414
}
1515
relative_path 'src/github.com/DataDog/datadog-agent'
1616

omnibus/config/software/datadog-iot-agent.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
source path: '..',
1212
options: {
13-
exclude: ["**/.cache/**/*"],
13+
exclude: ["**/.cache/**/*", "**/.git/fsmonitor--daemon.ipc"],
1414
}
1515
relative_path 'src/github.com/DataDog/datadog-agent'
1616

omnibus/config/software/datadog-otel-agent.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
exclude: [
1616
"**/.cache/**/*",
1717
"**/testdata/**/*",
18+
"**/.git/fsmonitor--daemon.ipc",
1819
],
1920
}
2021
relative_path 'src/github.com/DataDog/datadog-agent'

omnibus/config/software/installer.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
source path: '..',
1313
options: {
14-
exclude: ["**/.cache/**/*", "**/testdata/**/*"],
14+
exclude: ["**/.cache/**/*", "**/testdata/**/*", "**/.git/fsmonitor--daemon.ipc"],
1515
}
1616
relative_path 'src/github.com/DataDog/datadog-agent'
1717

0 commit comments

Comments
 (0)