Skip to content

Commit d4c63a9

Browse files
ci: Update cassandra versions and Makefile
- 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/
1 parent 8d3f108 commit d4c63a9

File tree

5 files changed

+20
-21
lines changed

5 files changed

+20
-21
lines changed

.ci/cassandra/server_v3.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM cassandra:3.11.11
1+
FROM cassandra:3.11.12
22
LABEL driver=cassandra role=server
33

44
# Tests run on a single node, only need to expose the CQL listener port.

.ci/cassandra/server_v4.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM cassandra:4.0.1
1+
FROM cassandra:4.0.3
22
LABEL driver=cassandra role=server
33

44
# Tests run on a single node, only need to expose the CQL listener port.

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,4 @@ Temporary Items
6666
.apdisk
6767

6868
# End of https://www.gitignore.io/api/go,linux,macos
69-
godfish
7069
bin

ci.Makefile

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,40 +6,40 @@ CI_DIR=./.ci
66
# NOTE: The client entrypoints require the other Makefile.
77
#
88
ci-cassandra3-up: build-base
9-
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/cassandra/v3.yml -- up --build --exit-code-from client
9+
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/cassandra/v3.yml up --build --exit-code-from client
1010
ci-cassandra3-down:
11-
docker-compose -f $(CI_DIR)/cassandra/v3.yml -- down --rmi all --volumes
11+
docker-compose -f $(CI_DIR)/cassandra/v3.yml down --rmi all --volumes
1212
ci-cassandra4-up: build-base
13-
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/cassandra/v4.yml -- up --build --exit-code-from client
13+
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/cassandra/v4.yml up --build --exit-code-from client
1414
ci-cassandra4-down:
15-
docker-compose -f $(CI_DIR)/cassandra/v4.yml -- down --rmi all --volumes
15+
docker-compose -f $(CI_DIR)/cassandra/v4.yml down --rmi all --volumes
1616

1717
ci-postgres12-up: build-base
18-
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/postgres/v12.yml -- up --build --exit-code-from client
18+
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/postgres/v12.yml up --build --exit-code-from client
1919
ci-postgres12-down:
20-
docker-compose -f $(CI_DIR)/postgres/v12.yml -- down --rmi all --volumes
20+
docker-compose -f $(CI_DIR)/postgres/v12.yml down --rmi all --volumes
2121
ci-postgres13-up: build-base
22-
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/postgres/v13.yml -- up --build --exit-code-from client
22+
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/postgres/v13.yml up --build --exit-code-from client
2323
ci-postgres13-down:
24-
docker-compose -f $(CI_DIR)/postgres/v13.yml -- down --rmi all --volumes
24+
docker-compose -f $(CI_DIR)/postgres/v13.yml down --rmi all --volumes
2525

2626
ci-mariadb-up: build-base
27-
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/mysql/mariadb_v10.yml -- up --build --exit-code-from client
27+
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/mysql/mariadb_v10.yml up --build --exit-code-from client
2828
ci-mariadb-down:
29-
docker-compose -f $(CI_DIR)/mysql/mariadb_v10.yml -- down --rmi all --volumes
29+
docker-compose -f $(CI_DIR)/mysql/mariadb_v10.yml down --rmi all --volumes
3030
ci-mysql57-up: build-base
31-
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/mysql/mysql_v57.yml -- up --build --exit-code-from client
31+
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/mysql/mysql_v57.yml up --build --exit-code-from client
3232
ci-mysql57-down:
33-
docker-compose -f $(CI_DIR)/mysql/mysql_v57.yml -- down --rmi all --volumes
33+
docker-compose -f $(CI_DIR)/mysql/mysql_v57.yml down --rmi all --volumes
3434
ci-mysql8-up: build-base
35-
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/mysql/mysql_v8.yml -- up --build --exit-code-from client
35+
BUILD_DIR=$(BUILD_DIR) docker-compose -f $(CI_DIR)/mysql/mysql_v8.yml up --build --exit-code-from client
3636
ci-mysql8-down:
37-
docker-compose -f $(CI_DIR)/mysql/mysql_v8.yml -- down --rmi all --volumes
37+
docker-compose -f $(CI_DIR)/mysql/mysql_v8.yml down --rmi all --volumes
3838

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

4444
#
4545
# Build and tag base image.

drivers/cassandra/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

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

5-
- 3.11.11
6-
- 4.0.1
5+
- 3.11.12
6+
- 4.0.3
77

88
## Connecting
99

0 commit comments

Comments
 (0)