Skip to content

Commit

Permalink
ci: Update cassandra versions and Makefile
Browse files Browse the repository at this point in the history
- Cassandra had some updates this month.
- Adjust Makefile to work with newer docker-compose versions

chore: Fix gitignore to recognize godfish directories
Ignoring that pattern was useful when the Makefile built a binary to
the path: godfish. Recently, it was changed to output to bin/
  • Loading branch information
rafaelespinoza committed Feb 20, 2022
1 parent 8d3f108 commit d4c63a9
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .ci/cassandra/server_v3.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cassandra:3.11.11
FROM cassandra:3.11.12
LABEL driver=cassandra role=server

# Tests run on a single node, only need to expose the CQL listener port.
Expand Down
2 changes: 1 addition & 1 deletion .ci/cassandra/server_v4.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cassandra:4.0.1
FROM cassandra:4.0.3
LABEL driver=cassandra role=server

# Tests run on a single node, only need to expose the CQL listener port.
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,4 @@ Temporary Items
.apdisk

# End of https://www.gitignore.io/api/go,linux,macos
godfish
bin
32 changes: 16 additions & 16 deletions ci.Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,40 @@ CI_DIR=./.ci
# NOTE: The client entrypoints require the other Makefile.
#
ci-cassandra3-up: build-base
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/cassandra/v3.yml -- up --build --exit-code-from client
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/cassandra/v3.yml up --build --exit-code-from client
ci-cassandra3-down:
docker-compose -f $(CI_DIR)/cassandra/v3.yml -- down --rmi all --volumes
docker-compose -f $(CI_DIR)/cassandra/v3.yml down --rmi all --volumes
ci-cassandra4-up: build-base
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/cassandra/v4.yml -- up --build --exit-code-from client
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/cassandra/v4.yml up --build --exit-code-from client
ci-cassandra4-down:
docker-compose -f $(CI_DIR)/cassandra/v4.yml -- down --rmi all --volumes
docker-compose -f $(CI_DIR)/cassandra/v4.yml down --rmi all --volumes

ci-postgres12-up: build-base
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/postgres/v12.yml -- up --build --exit-code-from client
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/postgres/v12.yml up --build --exit-code-from client
ci-postgres12-down:
docker-compose -f $(CI_DIR)/postgres/v12.yml -- down --rmi all --volumes
docker-compose -f $(CI_DIR)/postgres/v12.yml down --rmi all --volumes
ci-postgres13-up: build-base
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/postgres/v13.yml -- up --build --exit-code-from client
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/postgres/v13.yml up --build --exit-code-from client
ci-postgres13-down:
docker-compose -f $(CI_DIR)/postgres/v13.yml -- down --rmi all --volumes
docker-compose -f $(CI_DIR)/postgres/v13.yml down --rmi all --volumes

ci-mariadb-up: build-base
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/mysql/mariadb_v10.yml -- up --build --exit-code-from client
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/mysql/mariadb_v10.yml up --build --exit-code-from client
ci-mariadb-down:
docker-compose -f $(CI_DIR)/mysql/mariadb_v10.yml -- down --rmi all --volumes
docker-compose -f $(CI_DIR)/mysql/mariadb_v10.yml down --rmi all --volumes
ci-mysql57-up: build-base
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/mysql/mysql_v57.yml -- up --build --exit-code-from client
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/mysql/mysql_v57.yml up --build --exit-code-from client
ci-mysql57-down:
docker-compose -f $(CI_DIR)/mysql/mysql_v57.yml -- down --rmi all --volumes
docker-compose -f $(CI_DIR)/mysql/mysql_v57.yml down --rmi all --volumes
ci-mysql8-up: build-base
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/mysql/mysql_v8.yml -- up --build --exit-code-from client
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/mysql/mysql_v8.yml up --build --exit-code-from client
ci-mysql8-down:
docker-compose -f $(CI_DIR)/mysql/mysql_v8.yml -- down --rmi all --volumes
docker-compose -f $(CI_DIR)/mysql/mysql_v8.yml down --rmi all --volumes

ci-sqlite3-up: build-base
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/sqlite3/docker-compose.yml -- up --build --exit-code-from clientserver
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/sqlite3/docker-compose.yml up --build --exit-code-from clientserver
ci-sqlite3-down:
docker-compose -f $(CI_DIR)/sqlite3/docker-compose.yml -- down --rmi all --volumes
docker-compose -f $(CI_DIR)/sqlite3/docker-compose.yml down --rmi all --volumes

#
# Build and tag base image.
Expand Down
4 changes: 2 additions & 2 deletions drivers/cassandra/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

This `godfish.Driver` implementation has been tested against cassandra versions:

- 3.11.11
- 4.0.1
- 3.11.12
- 4.0.3

## Connecting

Expand Down

0 comments on commit d4c63a9

Please sign in to comment.