This is an automated email from the ASF dual-hosted git repository.
jgemignani pushed a commit to branch PG16
in repository https://gitbox.apache.org/repos/asf/age.git
The following commit(s) were added to refs/heads/PG16 by this push:
new 9a5bf3fa [CI] Update docker image tags (#1871)
9a5bf3fa is described below
commit 9a5bf3fa0ac68b93b73fd8f1db4cec14207f920e
Author: Muhammad Taha Naveed <[email protected]>
AuthorDate: Thu May 9 23:54:24 2024 +0500
[CI] Update docker image tags (#1871)
- Due to the recent changes in the docker image tags, the CI workflows
need to be updated to use the new tags.
---
.github/workflows/go-driver.yml | 8 +-------
.github/workflows/jdbc-driver.yaml | 8 +-------
.github/workflows/nodejs-driver.yaml | 8 +-------
.github/workflows/python-driver.yaml | 8 +-------
drivers/docker-compose.yml | 2 +-
.../lib/src/test/java/org/apache/age/jdbc/BaseDockerizedTest.java | 6 +-----
6 files changed, 6 insertions(+), 34 deletions(-)
diff --git a/.github/workflows/go-driver.yml b/.github/workflows/go-driver.yml
index fa9adcf1..24341ef8 100644
--- a/.github/workflows/go-driver.yml
+++ b/.github/workflows/go-driver.yml
@@ -21,14 +21,8 @@ jobs:
steps:
- uses: actions/checkout@v3
- - name: Set tag based on branch
- run: |
- echo "TAG=PG16_latest" >> $GITHUB_ENV
-
- name: Run apache/age docker image
- run: |
- export TAG=$TAG
- docker-compose up -d
+ run: docker-compose up -d
- name: Set up Go
uses: actions/setup-go@v3
diff --git a/.github/workflows/jdbc-driver.yaml
b/.github/workflows/jdbc-driver.yaml
index d91c8c97..3493013f 100644
--- a/.github/workflows/jdbc-driver.yaml
+++ b/.github/workflows/jdbc-driver.yaml
@@ -23,11 +23,5 @@ jobs:
distribution: 'zulu'
java-version: '17'
- - name: Set tag based on branch
- run: |
- echo "TAG=PG16_latest" >> $GITHUB_ENV
-
- name: Build and Test
- run: |
- export TAG=$TAG
- gradle build
+ run: gradle build
diff --git a/.github/workflows/nodejs-driver.yaml
b/.github/workflows/nodejs-driver.yaml
index c6433041..154a821b 100644
--- a/.github/workflows/nodejs-driver.yaml
+++ b/.github/workflows/nodejs-driver.yaml
@@ -18,14 +18,8 @@ jobs:
steps:
- uses: actions/checkout@v3
- - name: Set tag based on branch
- run: |
- echo "TAG=PG16_latest" >> $GITHUB_ENV
-
- name: Run apache/age docker image
- run: |
- export TAG=$TAG
- docker-compose up -d
+ run: docker-compose up -d
- name: Set up Node
uses: actions/setup-node@v3
diff --git a/.github/workflows/python-driver.yaml
b/.github/workflows/python-driver.yaml
index d6b576d8..68927099 100644
--- a/.github/workflows/python-driver.yaml
+++ b/.github/workflows/python-driver.yaml
@@ -18,14 +18,8 @@ jobs:
steps:
- uses: actions/checkout@v3
- - name: Set tag based on branch
- run: |
- echo "TAG=PG16_latest" >> $GITHUB_ENV
-
- name: Run apache/age docker image
- run: |
- export TAG=$TAG
- docker-compose up -d
+ run: docker-compose up -d
- name: Set up python
uses: actions/setup-python@v4
diff --git a/drivers/docker-compose.yml b/drivers/docker-compose.yml
index 45ab86a3..b0bb67d2 100644
--- a/drivers/docker-compose.yml
+++ b/drivers/docker-compose.yml
@@ -1,7 +1,7 @@
version: "3.3"
services:
db:
- image: apache/age:${TAG}
+ image: apache/age:dev_snapshot_PG16
environment:
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=agens
diff --git
a/drivers/jdbc/lib/src/test/java/org/apache/age/jdbc/BaseDockerizedTest.java
b/drivers/jdbc/lib/src/test/java/org/apache/age/jdbc/BaseDockerizedTest.java
index 2ed48a73..63cb3af8 100644
--- a/drivers/jdbc/lib/src/test/java/org/apache/age/jdbc/BaseDockerizedTest.java
+++ b/drivers/jdbc/lib/src/test/java/org/apache/age/jdbc/BaseDockerizedTest.java
@@ -50,13 +50,9 @@ public class BaseDockerizedTest {
@BeforeAll
public void beforeAll() throws Exception {
String CORRECT_DB_PASSWORDS = "postgres";
- String imageTag = System.getenv("TAG");
- if (imageTag == null) {
- imageTag = "latest";
- }
agensGraphContainer = new GenericContainer<>(DockerImageName
- .parse("apache/age:" + imageTag))
+ .parse("apache/age:dev_snapshot_PG16"))
.withEnv("POSTGRES_PASSWORD", CORRECT_DB_PASSWORDS)
.withExposedPorts(5432);
agensGraphContainer.start();