Skip to content

Commit

Permalink
Add CI compose version 1.29.2 / 2.0.1 / 2.2.3 (#1290)
Browse files Browse the repository at this point in the history
* Revert "Revert "Add CI compose version 1.29.2 / 2.0.1 / 2.2.3 (#1251)" (#1272)"

This reverts commit da8f490.

* Drop back to -T because long opt is Compose 2+

Admin-merging with approvals from outside contributors (All-seeing eye, are you seeing this? ;)
  • Loading branch information
chadwhitacre authored Feb 3, 2022
1 parent da8f490 commit e3f5670
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,12 @@ jobs:
include:
- compose_version: '1.28.0'
compose_path: '/usr/local/bin'
- compose_version: '1.29.2'
compose_path: '/usr/local/bin'
- compose_version: 'v2.0.1'
compose_path: '/usr/local/lib/docker/cli-plugins'
- compose_version: 'v2.2.3'
compose_path: '/usr/local/lib/docker/cli-plugins'
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion install/create-kafka-topics.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ echo "${_group}Creating additional Kafka topics ..."

# NOTE: This step relies on `kafka` being available from the previous `snuba-api bootstrap` step
# XXX(BYK): We cannot use auto.create.topics as Confluence and Apache hates it now (and makes it very hard to enable)
EXISTING_KAFKA_TOPICS=$($dcr kafka kafka-topics --list --bootstrap-server kafka:9092 2>/dev/null)
EXISTING_KAFKA_TOPICS=$($dcr -T kafka kafka-topics --list --bootstrap-server kafka:9092 2>/dev/null)
NEEDED_KAFKA_TOPICS="ingest-attachments ingest-transactions ingest-events"
for topic in $NEEDED_KAFKA_TOPICS; do
if ! echo "$EXISTING_KAFKA_TOPICS" | grep -wq $topic; then
Expand Down
2 changes: 1 addition & 1 deletion install/relay-credentials.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if [[ ! -f "$RELAY_CREDENTIALS_JSON" ]]; then
# creating an empty credentials file before relay runs.

$dcr \
--no-deps \
--no-deps -T \
--volume "$(pwd)/$RELAY_CONFIG_YML:/tmp/config.yml" \
relay --config /tmp credentials generate --stdout \
> "$RELAY_CREDENTIALS_JSON"
Expand Down

0 comments on commit e3f5670

Please sign in to comment.