Skip to content

Commit ba650f3

Browse files
committed
Revert "Revert "Add CI compose version 1.29.2 / 2.0.1 / 2.2.3 (#1251)" (#1272)"
This reverts commit da8f490.
1 parent da8f490 commit ba650f3

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,12 @@ jobs:
3232
include:
3333
- compose_version: '1.28.0'
3434
compose_path: '/usr/local/bin'
35+
- compose_version: '1.29.2'
36+
compose_path: '/usr/local/bin'
3537
- compose_version: 'v2.0.1'
3638
compose_path: '/usr/local/lib/docker/cli-plugins'
39+
- compose_version: 'v2.2.3'
40+
compose_path: '/usr/local/lib/docker/cli-plugins'
3741
steps:
3842
- name: Checkout
3943
uses: actions/checkout@v2

install/create-kafka-topics.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ echo "${_group}Creating additional Kafka topics ..."
22

33
# NOTE: This step relies on `kafka` being available from the previous `snuba-api bootstrap` step
44
# XXX(BYK): We cannot use auto.create.topics as Confluence and Apache hates it now (and makes it very hard to enable)
5-
EXISTING_KAFKA_TOPICS=$($dcr kafka kafka-topics --list --bootstrap-server kafka:9092 2>/dev/null)
5+
EXISTING_KAFKA_TOPICS=$($dcr --no-TTY kafka kafka-topics --list --bootstrap-server kafka:9092 2>/dev/null)
66
NEEDED_KAFKA_TOPICS="ingest-attachments ingest-transactions ingest-events"
77
for topic in $NEEDED_KAFKA_TOPICS; do
88
if ! echo "$EXISTING_KAFKA_TOPICS" | grep -wq $topic; then

install/relay-credentials.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if [[ ! -f "$RELAY_CREDENTIALS_JSON" ]]; then
1414
# creating an empty credentials file before relay runs.
1515

1616
$dcr \
17-
--no-deps \
17+
--no-deps --no-TTY \
1818
--volume "$(pwd)/$RELAY_CONFIG_YML:/tmp/config.yml" \
1919
relay --config /tmp credentials generate --stdout \
2020
> "$RELAY_CREDENTIALS_JSON"

0 commit comments

Comments
 (0)