This is an automated email from the ASF dual-hosted git repository.
jgemignani pushed a commit to branch PG12
in repository https://gitbox.apache.org/repos/asf/age.git
The following commit(s) were added to refs/heads/PG12 by this push:
new 5ba25387 Update CIs to trigger only for PG12 branch (#1114)
5ba25387 is described below
commit 5ba253876fcccec3cf99459b78cf41916a9ab175
Author: Muhammad Taha Naveed <[email protected]>
AuthorDate: Tue Aug 1 02:58:31 2023 +0500
Update CIs to trigger only for PG12 branch (#1114)
- Removed duplicate installcheck.yml
- Removed master as trigger branch
- Removed tags as it is not needed for this branch
---
.github/workflows/go-driver.yml | 26 ++---------
.github/workflows/installcheck.yaml | 8 ++--
.github/workflows/installcheck.yml | 52 ----------------------
.github/workflows/jdbc-driver.yaml | 24 ++--------
.github/workflows/nodejs-driver.yaml | 26 ++---------
.github/workflows/python-driver.yaml | 26 ++---------
.../org/apache/age/jdbc/BaseDockerizedTest.java | 4 --
7 files changed, 19 insertions(+), 147 deletions(-)
diff --git a/.github/workflows/go-driver.yml b/.github/workflows/go-driver.yml
index afba9cbe..2db3b98b 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", "PG12" ]
+ branches: [ "PG12" ]
pull_request:
- branches: [ "master", "PG12" ]
+ branches: [ "PG12" ]
jobs:
build:
@@ -21,26 +21,8 @@ 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/PG12" ]]; then
- echo "TAG=PG12_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" == "PG12" ]]; then
- echo "TAG=PG12_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 Go
uses: actions/setup-go@v3
@@ -54,4 +36,4 @@ jobs:
run: go build -v ./...
- name: Test
- run: go test . -v
+ run: go test . -v
\ No newline at end of file
diff --git a/.github/workflows/installcheck.yaml
b/.github/workflows/installcheck.yaml
index c35979cd..8de80d3e 100644
--- a/.github/workflows/installcheck.yaml
+++ b/.github/workflows/installcheck.yaml
@@ -1,10 +1,10 @@
-name: Build / Regression
+name: PG12 Regression
on:
push:
- branches: [ 'master', 'PG12' ]
+ branches: [ 'PG12' ]
pull_request:
- branches: [ 'master', 'PG12' ]
+ branches: [ 'PG12' ]
jobs:
build:
@@ -49,4 +49,4 @@ jobs:
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/installcheck.yml
b/.github/workflows/installcheck.yml
deleted file mode 100644
index 8372203e..00000000
--- a/.github/workflows/installcheck.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: PG12 Regression
-
-on:
- push:
- branches: [ 'PG12' ]
- pull_request:
- branches: [ 'PG12' ]
-
-jobs:
- build:
- runs-on: ubuntu-latest
-
- steps:
- - name: Get latest commit id of PostgreSQL 12
- run: |
- echo "PG_COMMIT_HASH=$(git ls-remote
git://git.postgresql.org/git/postgresql.git refs/heads/REL_12_STABLE | awk
'{print $1}')" >> $GITHUB_ENV
-
- - name: Cache PostgreSQL 12
- uses: actions/cache@v3
- id: pg12cache
- with:
- path: ~/pg12
- key: ${{ runner.os }}-v1-pg12-${{ env.PG_COMMIT_HASH }}
-
- - name: Install PostgreSQL 12
- if: steps.pg12cache.outputs.cache-hit != 'true'
- run: |
- git clone --depth 1 --branch REL_12_STABLE
git://git.postgresql.org/git/postgresql.git ~/pg12source
- cd ~/pg12source
- ./configure --prefix=$HOME/pg12 CFLAGS="-std=gnu99 -ggdb -O0"
--enable-cassert
- make install -j$(nproc) > /dev/null
-
- - uses: actions/checkout@v3
-
- - name: Build
- id: build
- run: |
- make PG_CONFIG=$HOME/pg12/bin/pg_config install -j$(nproc)
-
- - name: Regression tests
- id: regression_tests
- run: |
- make PG_CONFIG=$HOME/pg12/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
diff --git a/.github/workflows/jdbc-driver.yaml
b/.github/workflows/jdbc-driver.yaml
index d76ce6fa..9601681d 100644
--- a/.github/workflows/jdbc-driver.yaml
+++ b/.github/workflows/jdbc-driver.yaml
@@ -2,10 +2,10 @@ name: JDBC Driver Tests
on:
push:
- branches: [ "master", "PG12" ]
+ branches: [ "PG12" ]
pull_request:
- branches: [ "master", "PG12" ]
+ branches: [ "PG12" ]
jobs:
build:
@@ -23,23 +23,5 @@ jobs:
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/PG12" ]]; then
- echo "TAG=PG12_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" == "PG12" ]]; then
- echo "TAG=PG12_latest" >> $GITHUB_ENV
- fi
- fi
-
- name: Build and Test
- run: |
- export TAG=$TAG
- gradle build
+ run: gradle build
\ No newline at end of file
diff --git a/.github/workflows/nodejs-driver.yaml
b/.github/workflows/nodejs-driver.yaml
index b2a4e0ea..a17bd49e 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", "PG12" ]
+ branches: [ "PG12" ]
pull_request:
- branches: [ "master", "PG12" ]
+ branches: [ "PG12" ]
jobs:
build:
@@ -18,26 +18,8 @@ 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/PG12" ]]; then
- echo "TAG=PG12_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" == "PG12" ]]; then
- echo "TAG=PG12_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
@@ -51,4 +33,4 @@ jobs:
run: npm run build
- name: Test
- run: npm test
+ run: npm test
\ No newline at end of file
diff --git a/.github/workflows/python-driver.yaml
b/.github/workflows/python-driver.yaml
index df3ed71b..c573691e 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", "PG12" ]
+ branches: [ "PG12" ]
pull_request:
- branches: [ "master", "PG12" ]
+ branches: [ "PG12" ]
jobs:
build:
@@ -18,26 +18,8 @@ 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/PG12" ]]; then
- echo "TAG=PG12_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" == "PG12" ]]; then
- echo "TAG=PG12_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/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 b743258b..5624130f 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,11 +50,7 @@ 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:PG12_latest"))
.withEnv("POSTGRES_PASSWORD", CORRECT_DB_PASSWORDS)
