This is an automated email from the ASF dual-hosted git repository.
jgemignani pushed a commit to branch PG11
in repository https://gitbox.apache.org/repos/asf/age.git
The following commit(s) were added to refs/heads/PG11 by this push:
new 2f471e53 Update CIs to trigger only for PG11 branch (#1116)
2f471e53 is described below
commit 2f471e532f3e68f243f1b5c6113b3ff7e5b2b909
Author: Muhammad Taha Naveed <[email protected]>
AuthorDate: Tue Aug 1 03:42:54 2023 +0500
Update CIs to trigger only for PG11 branch (#1116)
- Removed master as trigger branch
- Removed tags as it is not needed for this branch
---
.github/workflows/go-driver.yml | 22 ++-------------
.github/workflows/installcheck.yaml | 8 +++---
.github/workflows/jdbc-driver.yaml | 30 ++++----------------
.github/workflows/nodejs-driver.yaml | 28 ++++---------------
.github/workflows/python-driver.yaml | 32 +++++-----------------
drivers/docker-compose.yml | 2 +-
.../org/apache/age/jdbc/BaseDockerizedTest.java | 6 +---
7 files changed, 27 insertions(+), 101 deletions(-)
diff --git a/.github/workflows/go-driver.yml b/.github/workflows/go-driver.yml
index f60ae802..59030d38 100644
--- a/.github/workflows/go-driver.yml
+++ b/.github/workflows/go-driver.yml
@@ -2,10 +2,10 @@ name: Go Driver Tests
on:
push:
- branches: [ "master", "PG11" ]
+ branches: [ "PG11" ]
pull_request:
- branches: [ "master", "PG11" ]
+ branches: [ "PG11" ]
jobs:
build:
@@ -21,22 +21,6 @@ jobs:
steps:
- uses: actions/checkout@v3
- - name: Set tag based on branch
- run: |
- if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then
- if [[ "$GITHUB_REF" == "refs/heads/master" ]]; then
- echo "TAG=latest" >> $GITHUB_ENV
- elif [[ "$GITHUB_REF" == "refs/heads/PG11" ]]; then
- echo "TAG=PG11_latest" >> $GITHUB_ENV
- fi
- elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
- if [[ "$GITHUB_BASE_REF" == "master" ]]; then
- echo "TAG=latest" >> $GITHUB_ENV
- elif [[ "$GITHUB_BASE_REF" == "PG11" ]]; then
- echo "TAG=PG11_latest" >> $GITHUB_ENV
- fi
- fi
-
- name: Run apache/age docker image
run: |
export TAG=$TAG
@@ -46,7 +30,7 @@ jobs:
uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go-version }}
-
+
- name: Generate
run: go generate ./../...
diff --git a/.github/workflows/installcheck.yaml
b/.github/workflows/installcheck.yaml
index b18921f2..2388bf6a 100644
--- a/.github/workflows/installcheck.yaml
+++ b/.github/workflows/installcheck.yaml
@@ -2,9 +2,9 @@ name: Build / Regression
on:
push:
- branches: [ 'master', 'PG11' ]
+ branches: [ 'PG11' ]
pull_request:
- branches: [ 'master', 'PG11' ]
+ branches: [ 'PG11' ]
jobs:
build:
@@ -42,11 +42,11 @@ jobs:
run: |
make PG_CONFIG=$HOME/pg11/bin/pg_config installcheck
continue-on-error: true
-
+
- name: Dump regression test errors
if: steps.regression_tests.outcome != 'success'
run: |
echo "Dump section begin."
cat $HOME/work/age/age/regress/regression.diffs
echo "Dump section end."
- exit 1
+ exit 1
\ No newline at end of file
diff --git a/.github/workflows/jdbc-driver.yaml
b/.github/workflows/jdbc-driver.yaml
index c4037382..6607f05a 100644
--- a/.github/workflows/jdbc-driver.yaml
+++ b/.github/workflows/jdbc-driver.yaml
@@ -2,45 +2,27 @@ name: JDBC Driver Tests
on:
push:
- branches: [ "master", "PG11" ]
-
+ branches: [ "PG11" ]
+
pull_request:
- branches: [ "master", "PG11" ]
+ branches: [ "PG11" ]
jobs:
build:
runs-on: ubuntu-latest
-
+
defaults:
run:
working-directory: drivers/jdbc
steps:
- uses: actions/checkout@v3
-
+
- name: Set up Java
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '17'
- - name: Set tag based on branch
- run: |
- if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then
- if [[ "$GITHUB_REF" == "refs/heads/master" ]]; then
- echo "TAG=latest" >> $GITHUB_ENV
- elif [[ "$GITHUB_REF" == "refs/heads/PG11" ]]; then
- echo "TAG=PG11_latest" >> $GITHUB_ENV
- fi
- elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
- if [[ "$GITHUB_BASE_REF" == "master" ]]; then
- echo "TAG=latest" >> $GITHUB_ENV
- elif [[ "$GITHUB_BASE_REF" == "PG11" ]]; then
- echo "TAG=PG11_latest" >> $GITHUB_ENV
- fi
- fi
-
- name: Build and Test
- run: |
- export TAG=$TAG
- gradle build
\ No newline at end of file
+ run: gradle build
\ No newline at end of file
diff --git a/.github/workflows/nodejs-driver.yaml
b/.github/workflows/nodejs-driver.yaml
index 55dccae5..ad799363 100644
--- a/.github/workflows/nodejs-driver.yaml
+++ b/.github/workflows/nodejs-driver.yaml
@@ -2,10 +2,10 @@ name: Nodejs Driver Tests
on:
push:
- branches: [ "master", "PG11" ]
+ branches: [ "PG11" ]
pull_request:
- branches: [ "master", "PG11" ]
+ branches: [ "PG11" ]
jobs:
build:
@@ -14,30 +14,12 @@ jobs:
defaults:
run:
working-directory: drivers/nodejs/
-
+
steps:
- uses: actions/checkout@v3
-
- - name: Set tag based on branch
- run: |
- if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then
- if [[ "$GITHUB_REF" == "refs/heads/master" ]]; then
- echo "TAG=latest" >> $GITHUB_ENV
- elif [[ "$GITHUB_REF" == "refs/heads/PG11" ]]; then
- echo "TAG=PG11_latest" >> $GITHUB_ENV
- fi
- elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
- if [[ "$GITHUB_BASE_REF" == "master" ]]; then
- echo "TAG=latest" >> $GITHUB_ENV
- elif [[ "$GITHUB_BASE_REF" == "PG11" ]]; then
- echo "TAG=PG11_latest" >> $GITHUB_ENV
- fi
- fi
-
+
- 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 92e1a48a..68005bb5 100644
--- a/.github/workflows/python-driver.yaml
+++ b/.github/workflows/python-driver.yaml
@@ -2,10 +2,10 @@ name: Python Driver Tests
on:
push:
- branches: [ "master", "PG11" ]
-
+ branches: [ "PG11" ]
+
pull_request:
- branches: [ "master", "PG11" ]
+ branches: [ "PG11" ]
jobs:
build:
@@ -14,30 +14,12 @@ jobs:
defaults:
run:
working-directory: drivers/python
-
+
steps:
- uses: actions/checkout@v3
-
- - name: Set tag based on branch
- run: |
- if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then
- if [[ "$GITHUB_REF" == "refs/heads/master" ]]; then
- echo "TAG=latest" >> $GITHUB_ENV
- elif [[ "$GITHUB_REF" == "refs/heads/PG11" ]]; then
- echo "TAG=PG11_latest" >> $GITHUB_ENV
- fi
- elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
- if [[ "$GITHUB_BASE_REF" == "master" ]]; then
- echo "TAG=latest" >> $GITHUB_ENV
- elif [[ "$GITHUB_BASE_REF" == "PG11" ]]; then
- echo "TAG=PG11_latest" >> $GITHUB_ENV
- fi
- fi
-
+
- 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
@@ -56,4 +38,4 @@ jobs:
- name: Test
run: |
python test_age_py.py -db "postgres" -u "postgres" -pass "agens"
- python -m unittest -v test_agtypes.py
+ python -m unittest -v test_agtypes.py
\ No newline at end of file
diff --git a/drivers/docker-compose.yml b/drivers/docker-compose.yml
index 1716d227..3184acd5 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:PG11_latest
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..d5432063 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:PG11_latest"))
.withEnv("POSTGRES_PASSWORD", CORRECT_DB_PASSWORDS)
.withExposedPorts(5432);
agensGraphContainer.start();
