From 311d51ca3fd8e103c3699c25a82153ddac4a72ab Mon Sep 17 00:00:00 2001 From: John Gemignani Date: Sat, 20 Dec 2025 00:32:18 -0800 Subject: [PATCH] Adjust CI for Dev_Multiple_Labels branch Adjusted the CI files to work with the Dev_Multiple_Labels branch to enable PR checks. modified: .github/labeler.yml modified: .github/workflows/go-driver.yml modified: .github/workflows/installcheck.yaml modified: .github/workflows/jdbc-driver.yaml modified: .github/workflows/nodejs-driver.yaml modified: .github/workflows/python-driver.yaml modified: drivers/docker-compose.yml modified: drivers/jdbc/lib/src/test/java/org/apache/age/jdbc/BaseDockerizedTest.java --- .github/labeler.yml | 3 +++ .github/workflows/go-driver.yml | 4 ++-- .github/workflows/installcheck.yaml | 4 ++-- .github/workflows/jdbc-driver.yaml | 4 ++-- .github/workflows/nodejs-driver.yaml | 4 ++-- .github/workflows/python-driver.yaml | 4 ++-- drivers/docker-compose.yml | 2 +- .../src/test/java/org/apache/age/jdbc/BaseDockerizedTest.java | 2 +- 8 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 6baa297c5..dc80e6ddc 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -19,5 +19,8 @@ PG16: PG17: - base-branch: 'PG17' +Dev_Multiple_Labels: +- base-branch: 'Dev_Multiple_Labels' + master: - base-branch: 'master' diff --git a/.github/workflows/go-driver.yml b/.github/workflows/go-driver.yml index 5b6d15030..ee09242e4 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" ] + branches: [ "Dev_Multiple_Labels" ] pull_request: - branches: [ "master" ] + branches: [ "Dev_Multiple_Labels" ] jobs: build: diff --git a/.github/workflows/installcheck.yaml b/.github/workflows/installcheck.yaml index da266f0da..78456ba28 100644 --- a/.github/workflows/installcheck.yaml +++ b/.github/workflows/installcheck.yaml @@ -2,9 +2,9 @@ name: Build / Regression on: push: - branches: [ "master" ] + branches: [ "Dev_Multiple_Labels" ] pull_request: - branches: [ "master" ] + branches: [ "Dev_Multiple_Labels" ] jobs: build: diff --git a/.github/workflows/jdbc-driver.yaml b/.github/workflows/jdbc-driver.yaml index 29b368438..29452d467 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" ] + branches: [ "Dev_Multiple_Labels" ] pull_request: - branches: [ "master" ] + branches: [ "Dev_Multiple_Labels" ] jobs: build: diff --git a/.github/workflows/nodejs-driver.yaml b/.github/workflows/nodejs-driver.yaml index 3d9e07023..cc5a8d62d 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" ] + branches: [ "Dev_Multiple_Labels" ] pull_request: - branches: [ "master" ] + branches: [ "Dev_Multiple_Labels" ] jobs: build: diff --git a/.github/workflows/python-driver.yaml b/.github/workflows/python-driver.yaml index 4dad14638..92c4f40b9 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" ] + branches: [ "Dev_Multiple_Labels" ] pull_request: - branches: [ "master" ] + branches: [ "Dev_Multiple_Labels" ] jobs: build: diff --git a/drivers/docker-compose.yml b/drivers/docker-compose.yml index 9ec072db5..89ac396cd 100644 --- a/drivers/docker-compose.yml +++ b/drivers/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.3" services: db: - image: apache/age:dev_snapshot_master + image: apache/age:dev_snapshot_Dev_Multiple_Labels 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 393175c3d..43636dfd7 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 @@ -52,7 +52,7 @@ public void beforeAll() throws Exception { String CORRECT_DB_PASSWORDS = "postgres"; agensGraphContainer = new GenericContainer<>(DockerImageName - .parse("apache/age:dev_snapshot_master")) + .parse("apache/age:dev_snapshot_Dev_Multiple_Labels")) .withEnv("POSTGRES_PASSWORD", CORRECT_DB_PASSWORDS) .withExposedPorts(5432); agensGraphContainer.start();