From 242722e4fb34b1c93cf1453334ea1b7cefb30266 Mon Sep 17 00:00:00 2001 From: Rafael Espinoza Date: Tue, 6 Jun 2023 09:41:15 -0700 Subject: [PATCH] ci: Update postgres versions to 14, 15 --- ...r_v12.Dockerfile => server_v14.Dockerfile} | 2 +- ...r_v13.Dockerfile => server_v15.Dockerfile} | 2 +- .ci/postgres/{v12.yml => v14.yml} | 6 ++--- .ci/postgres/{v13.yml => v15.yml} | 6 ++--- .github/workflows/build-postgres.yml | 16 ++++++------- README.md | 8 +++---- ci.Makefile | 24 +++++++++---------- 7 files changed, 32 insertions(+), 32 deletions(-) rename .ci/postgres/{server_v12.Dockerfile => server_v14.Dockerfile} (80%) rename .ci/postgres/{server_v13.Dockerfile => server_v15.Dockerfile} (80%) rename .ci/postgres/{v12.yml => v14.yml} (82%) rename .ci/postgres/{v13.yml => v15.yml} (82%) diff --git a/.ci/postgres/server_v12.Dockerfile b/.ci/postgres/server_v14.Dockerfile similarity index 80% rename from .ci/postgres/server_v12.Dockerfile rename to .ci/postgres/server_v14.Dockerfile index b15dc36..e0f4a72 100644 --- a/.ci/postgres/server_v12.Dockerfile +++ b/.ci/postgres/server_v14.Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:12-alpine +FROM postgres:14-alpine WORKDIR /var/lib/postgresql COPY .ci/postgres/server.sh scripts/ RUN scripts/server.sh diff --git a/.ci/postgres/server_v13.Dockerfile b/.ci/postgres/server_v15.Dockerfile similarity index 80% rename from .ci/postgres/server_v13.Dockerfile rename to .ci/postgres/server_v15.Dockerfile index bcecd92..92837bb 100644 --- a/.ci/postgres/server_v13.Dockerfile +++ b/.ci/postgres/server_v15.Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:13-alpine +FROM postgres:15-alpine WORKDIR /var/lib/postgresql COPY .ci/postgres/server.sh scripts/ RUN scripts/server.sh diff --git a/.ci/postgres/v12.yml b/.ci/postgres/v14.yml similarity index 82% rename from .ci/postgres/v12.yml rename to .ci/postgres/v14.yml index 6c5329c..7314b3e 100644 --- a/.ci/postgres/v12.yml +++ b/.ci/postgres/v14.yml @@ -19,9 +19,9 @@ services: server: build: context: "${BUILD_DIR}" - dockerfile: "${BUILD_DIR}/.ci/postgres/server_v12.Dockerfile" - image: godfish_test/postgres/server_v12:latest - container_name: godfish_ci_postgres_server_v12 + dockerfile: "${BUILD_DIR}/.ci/postgres/server_v14.Dockerfile" + image: godfish_test/postgres/server_v14:latest + container_name: godfish_ci_postgres_server_v14 env_file: - env expose: diff --git a/.ci/postgres/v13.yml b/.ci/postgres/v15.yml similarity index 82% rename from .ci/postgres/v13.yml rename to .ci/postgres/v15.yml index 2779783..f662d17 100644 --- a/.ci/postgres/v13.yml +++ b/.ci/postgres/v15.yml @@ -19,9 +19,9 @@ services: server: build: context: "${BUILD_DIR}" - dockerfile: "${BUILD_DIR}/.ci/postgres/server_v13.Dockerfile" - image: godfish_test/postgres/server_v13:latest - container_name: godfish_ci_postgres_server_v13 + dockerfile: "${BUILD_DIR}/.ci/postgres/server_v15.Dockerfile" + image: godfish_test/postgres/server_v15:latest + container_name: godfish_ci_postgres_server_v15 env_file: - env expose: diff --git a/.github/workflows/build-postgres.yml b/.github/workflows/build-postgres.yml index 07b06d4..7f935fb 100644 --- a/.github/workflows/build-postgres.yml +++ b/.github/workflows/build-postgres.yml @@ -1,14 +1,14 @@ name: postgres on: [push, pull_request] jobs: - v12: - name: postgres v12 + v14: + name: postgres v14 runs-on: ubuntu-latest steps: - name: Checkout repo uses: actions/checkout@v3 - name: Build environment and run tests - run: make -f ci.Makefile ci-postgres12-up + run: make -f ci.Makefile ci-postgres14-up - name: Upload code coverage uses: codecov/codecov-action@v3 with: @@ -16,15 +16,15 @@ jobs: files: /tmp/cover.out,/tmp/cover_driver.out verbose: true - name: Teardown - run: make -f ci.Makefile ci-postgres12-down - v13: - name: postgres v13 + run: make -f ci.Makefile ci-postgres14-down + v15: + name: postgres v15 runs-on: ubuntu-latest steps: - name: Checkout repo uses: actions/checkout@v3 - name: Build environment and run tests - run: make -f ci.Makefile ci-postgres13-up + run: make -f ci.Makefile ci-postgres15-up - name: Upload code coverage uses: codecov/codecov-action@v3 with: @@ -32,4 +32,4 @@ jobs: files: /tmp/cover.out,/tmp/cover_driver.out verbose: true - name: Teardown - run: make -f ci.Makefile ci-postgres13-down + run: make -f ci.Makefile ci-postgres15-down diff --git a/README.md b/README.md index 426a4ef..58ce2a7 100644 --- a/README.md +++ b/README.md @@ -167,8 +167,8 @@ make -f ci.Makefile ci-mariadb-up make -f ci.Makefile ci-mysql57-up make -f ci.Makefile ci-mysql8-up -make -f ci.Makefile ci-postgres12-up -make -f ci.Makefile ci-postgres13-up +make -f ci.Makefile ci-postgres14-up +make -f ci.Makefile ci-postgres15-up make -f ci.Makefile ci-sqlite3-up ``` @@ -184,8 +184,8 @@ make -f ci.Makefile ci-mariadb-down make -f ci.Makefile ci-mysql57-down make -f ci.Makefile ci-mysql8-down -make -f ci.Makefile ci-postgres12-down -make -f ci.Makefile ci-postgres13-down +make -f ci.Makefile ci-postgres14-down +make -f ci.Makefile ci-postgres15-down make -f ci.Makefile ci-sqlite3-down ``` diff --git a/ci.Makefile b/ci.Makefile index 598a752..f1f313e 100644 --- a/ci.Makefile +++ b/ci.Makefile @@ -19,19 +19,19 @@ ci-cassandra4-up: build-base ci-cassandra4-down: docker-compose -f $(CASSANDRA_V4_FILE) down --rmi all --volumes -POSTGRES_V12_FILE=$(CI_DIR)/postgres/v12.yml -ci-postgres12-up: build-base - BUILD_DIR=$(BUILD_DIR) docker-compose -f $(POSTGRES_V12_FILE) up --build --exit-code-from client && \ - .ci/cp_coverage_to_host.sh $(POSTGRES_V12_FILE) -ci-postgres12-down: - docker-compose -f $(POSTGRES_V12_FILE) down --rmi all --volumes +POSTGRES_V14_FILE=$(CI_DIR)/postgres/v14.yml +ci-postgres14-up: build-base + BUILD_DIR=$(BUILD_DIR) docker-compose -f $(POSTGRES_V14_FILE) up --build --exit-code-from client && \ + .ci/cp_coverage_to_host.sh $(POSTGRES_V14_FILE) +ci-postgres14-down: + docker-compose -f $(POSTGRES_V14_FILE) down --rmi all --volumes -POSTGRES_V13_FILE=$(CI_DIR)/postgres/v13.yml -ci-postgres13-up: build-base - BUILD_DIR=$(BUILD_DIR) docker-compose -f $(POSTGRES_V13_FILE) up --build --exit-code-from client && \ - .ci/cp_coverage_to_host.sh $(POSTGRES_V13_FILE) -ci-postgres13-down: - docker-compose -f $(POSTGRES_V13_FILE) down --rmi all --volumes +POSTGRES_V15_FILE=$(CI_DIR)/postgres/v15.yml +ci-postgres15-up: build-base + BUILD_DIR=$(BUILD_DIR) docker-compose -f $(POSTGRES_V15_FILE) up --build --exit-code-from client && \ + .ci/cp_coverage_to_host.sh $(POSTGRES_V15_FILE) +ci-postgres15-down: + docker-compose -f $(POSTGRES_V15_FILE) down --rmi all --volumes MARIA_DB_FILE=$(CI_DIR)/mysql/mariadb_v10.yml ci-mariadb-up: build-base