This is an automated email from the ASF dual-hosted git repository.
jgemignani pushed a commit to branch PG13
in repository https://gitbox.apache.org/repos/asf/age.git
The following commit(s) were added to refs/heads/PG13 by this push:
new 89824b4f Update CIs to trigger only for PG13 branch (#1118)
89824b4f is described below
commit 89824b4f3f03fa6ebd388aa70887c68bd3e152ff
Author: Muhammad Taha Naveed <[email protected]>
AuthorDate: Tue Aug 1 05:06:49 2023 +0500
Update CIs to trigger only for PG13 branch (#1118)
- Removed duplicate installcheck.yml
- Removed master as trigger branch
- Removed tags as it is not needed now for this branch
---
.github/workflows/installcheck.yaml | 6 +--
.github/workflows/installcheck.yml | 52 ----------------------
.github/workflows/jdbc-driver.yaml | 20 +--------
.github/workflows/nodejs-driver.yaml | 2 +-
.github/workflows/python-driver.yaml | 3 +-
.../org/apache/age/jdbc/BaseDockerizedTest.java | 4 --
6 files changed, 6 insertions(+), 81 deletions(-)
diff --git a/.github/workflows/installcheck.yaml
b/.github/workflows/installcheck.yaml
index 607731cb..106737a5 100644
--- a/.github/workflows/installcheck.yaml
+++ b/.github/workflows/installcheck.yaml
@@ -2,9 +2,9 @@ name: Build / Regression
on:
push:
- branches: [ 'master', 'PG13' ]
+ branches: [ 'PG13' ]
pull_request:
- branches: [ 'master', 'PG13' ]
+ branches: [ 'PG13' ]
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 6bc6a727..00000000
--- a/.github/workflows/installcheck.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: PG13 Build / Regression
-
-on:
- push:
- branches: [ 'PG13' ]
- pull_request:
- branches: [ 'PG13' ]
-
-jobs:
- build:
- runs-on: ubuntu-latest
-
- steps:
- - name: Get latest commit id of PostgreSQL 13
- run: |
- echo "PG_COMMIT_HASH=$(git ls-remote
git://git.postgresql.org/git/postgresql.git refs/heads/REL_13_STABLE | awk
'{print $1}')" >> $GITHUB_ENV
-
- - name: Cache PostgreSQL 13
- uses: actions/cache@v3
- id: pg13cache
- with:
- path: ~/pg13
- key: ${{ runner.os }}-v1-pg13-${{ env.PG_COMMIT_HASH }}
-
- - name: Install PostgreSQL 13
- if: steps.pg13cache.outputs.cache-hit != 'true'
- run: |
- git clone --depth 1 --branch REL_13_STABLE
git://git.postgresql.org/git/postgresql.git ~/pg13source
- cd ~/pg13source
- ./configure --prefix=$HOME/pg13 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/pg13/bin/pg_config install -j$(nproc)
-
- - name: Regression tests
- id: regression_tests
- run: |
- make PG_CONFIG=$HOME/pg13/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 7f45a6c3..faba6813 100644
--- a/.github/workflows/jdbc-driver.yaml
+++ b/.github/workflows/jdbc-driver.yaml
@@ -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/PG13" ]]; then
- echo "TAG=PG13_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" == "PG13" ]]; then
- echo "TAG=PG13_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 df587abf..2318e3d1 100644
--- a/.github/workflows/nodejs-driver.yaml
+++ b/.github/workflows/nodejs-driver.yaml
@@ -13,7 +13,7 @@ jobs:
defaults:
run:
- working-directory: drivers/nodejs/
+ working-directory: drivers/nodejs
steps:
- uses: actions/checkout@v3
diff --git a/.github/workflows/python-driver.yaml
b/.github/workflows/python-driver.yaml
index 95cbe4b6..aa84fea9 100644
--- a/.github/workflows/python-driver.yaml
+++ b/.github/workflows/python-driver.yaml
@@ -32,8 +32,7 @@ jobs:
pip install -r requirements.txt
- name: Build
- run: |
- python setup.py install
+ run: python setup.py install
- name: Test
run: |
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 5d7eea9c..936a4ac3 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:PG13_latest"))
.withEnv("POSTGRES_PASSWORD", CORRECT_DB_PASSWORDS)
