Skip to content

Commit

Permalink
Asio and RE2 are handled via Bazel now
Browse files Browse the repository at this point in the history
Change-Id: I72f79bfcdb31403123f82452b6a162a9e0c1ae3d
  • Loading branch information
spt29 committed Aug 6, 2024
1 parent 196cb4c commit eb4a785
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 20 deletions.
12 changes: 3 additions & 9 deletions buildscripts/scripts/stages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,6 @@ VARIABLES:
SH: "echo '${CHANGED_FILES_REL}' | grep 'checkman/' || true"
REPLACE_NEWLINES: true

- NAME: CHANGED_ASIO_FILES
SH: "echo '${CHANGED_FILES_REL}' | grep '^third_party/asio' || true"

- NAME: CHANGED_RE2_FILES
SH: "echo '${CHANGED_FILES_REL}' | grep '^third_party/re2' || true"

########## packages ########################################################

- NAME: CHANGED_CHECK_CERT_FILES
Expand Down Expand Up @@ -389,7 +383,7 @@ STAGES:
# files. The ordering is a bit ad hoc, perhaps we should keep the list of
# steps here in dependency order.
- NAME: "Package livestatus"
ONLY_WHEN_NOT_EMPTY: CHANGED_REFERENCE_IMAGE,CHANGED_LIVESTATUS_FILES,CHANGED_ASIO_FILES,CHANGED_RE2_FILES
ONLY_WHEN_NOT_EMPTY: CHANGED_REFERENCE_IMAGE,CHANGED_LIVESTATUS_FILES
DIR: "packages/livestatus"
COMMAND: >
../../scripts/run-in-docker.sh "./run --all" &> ${RESULTS}/livestatus.txt
Expand All @@ -398,7 +392,7 @@ STAGES:
RESULT_CHECK_FILE_PATTERN: "results/livestatus.txt"

- NAME: "Package cmc"
ONLY_WHEN_NOT_EMPTY: CHANGED_REFERENCE_IMAGE,CHANGED_CMC_FILES,CHANGED_CMC_PROTO_FILES,CHANGED_LIVESTATUS_FILES,CHANGED_ASIO_FILES,CHANGED_RE2_FILES
ONLY_WHEN_NOT_EMPTY: CHANGED_REFERENCE_IMAGE,CHANGED_CMC_FILES,CHANGED_CMC_PROTO_FILES,CHANGED_LIVESTATUS_FILES
DIR: "packages/cmc"
COMMAND: >
../../scripts/run-in-docker.sh "./run --all" &> ${RESULTS}/cmc.txt
Expand Down Expand Up @@ -500,7 +494,7 @@ STAGES:
RESULT_CHECK_FILE_PATTERN: "results/mk-sql.txt"

- NAME: "Package neb"
ONLY_WHEN_NOT_EMPTY: CHANGED_REFERENCE_IMAGE,CHANGED_NEB_FILES,CHANGED_LIVESTATUS_FILES,CHANGED_ASIO_FILES,CHANGED_RE2_FILES
ONLY_WHEN_NOT_EMPTY: CHANGED_REFERENCE_IMAGE,CHANGED_NEB_FILES,CHANGED_LIVESTATUS_FILES
DIR: "packages/neb"
COMMAND: >
../../scripts/run-in-docker.sh "./run --all" &> ${RESULTS}/neb.txt
Expand Down
6 changes: 1 addition & 5 deletions packages/livestatus/ci.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
"command_line": "GCC_TOOLCHAIN=/opt/gcc-13.2.0 ./run --clean --all",
"maintainers": ["[email protected]"],
"dependencies": [
"third_party/asio/",
"third_party/re2/"
]
"maintainers": ["[email protected]"]
}
7 changes: 1 addition & 6 deletions packages/neb/ci.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
{
"command_line": "GCC_TOOLCHAIN=/opt/gcc-13.2.0 ./run --clean --all",
"maintainers": ["[email protected]"],
"dependencies": [
"packages/neb/",
"packages/livestatus/",
"third_party/asio/",
"third_party/re2/"
]
"dependencies": ["packages/neb/", "packages/livestatus/"]
}

0 comments on commit eb4a785

Please sign in to comment.