Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OSS-ONLY] Finalize BABEL_4_4_STABLE #3047

Merged
merged 1 commit into from
Oct 23, 2024
Merged

[OSS-ONLY] Finalize BABEL_4_4_STABLE #3047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/clone_engine_repo.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DEFAULT_BRANCH=BABEL_4_X_DEV__PG_16_X
DEFAULT_BRANCH=BABEL_4_4_STABLE__PG_16_5
8 changes: 4 additions & 4 deletions .github/template/version-branch-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
engine_branch: BABEL_2_10_STABLE__PG_14_13
extension_branch: BABEL_2_10_STABLE
'14.14':
engine_branch: BABEL_2_X_DEV__PG_14_X
extension_branch: BABEL_2_X_DEV
engine_branch: BABEL_2_11_STABLE__PG_14_14
extension_branch: BABEL_2_11_STABLE
'15.2':
engine_branch: BABEL_3_1_STABLE__PG_15_2
extension_branch: BABEL_3_1_STABLE
Expand All @@ -71,8 +71,8 @@
engine_branch: BABEL_3_7_STABLE__PG_15_8
extension_branch: BABEL_3_7_STABLE
'15.9':
engine_branch: BABEL_3_X_DEV__PG_15_X
extension_branch: BABEL_3_X_DEV
engine_branch: BABEL_3_8_STABLE__PG_15_9
extension_branch: BABEL_3_8_STABLE
'16.1':
engine_branch: BABEL_4_0_STABLE__PG_16_1
extension_branch: BABEL_4_0_STABLE
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/major-version-upgrade.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ jobs:
env:
OLD_INSTALL_DIR: psql_source
NEW_INSTALL_DIR: psql_target
ENGINE_BRANCH_FROM: BABEL_2_X_DEV__PG_14_X
EXTENSION_BRANCH_FROM: BABEL_2_X_DEV
ENGINE_BRANCH_FROM: BABEL_2_11_STABLE__PG_14_14
EXTENSION_BRANCH_FROM: BABEL_2_11_STABLE

runs-on: ubuntu-20.04
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/singledb-version-upgrade.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
env:
OLD_INSTALL_DIR: psql_source
NEW_INSTALL_DIR: psql_target
ENGINE_BRANCH_FROM: BABEL_2_X_DEV__PG_14_X
EXTENSION_BRANCH_FROM: BABEL_2_X_DEV
ENGINE_BRANCH_FROM: BABEL_2_11_STABLE__PG_14_14
EXTENSION_BRANCH_FROM: BABEL_2_11_STABLE

runs-on: ubuntu-20.04
steps:
Expand Down
2 changes: 1 addition & 1 deletion contrib/babelfishpg_tds/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ TSQL_SRC = ../babelfishpg_tsql

PG_CFLAGS += -Werror -Wfloat-conversion
PG_CFLAGS += -fstack-protector-strong
PG_CPPFLAGS += -I$(TSQL_SRC) -I$(PG_SRC) -I$(tds_top_dir) -DFAULT_INJECTOR
PG_CPPFLAGS += -I$(TSQL_SRC) -I$(PG_SRC) -I$(tds_top_dir)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not in tsql extension make file ?


# Exclude the following files from the build (sometimes these
# files are included in another c file)
Expand Down
4 changes: 4 additions & 0 deletions test/JDBC/jdbc_schedule
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ all
ignore#!#insertbulk
ignore#!#BABEL-SQLvariant

# TDS fault injection framework is meant for internal testing only. So, ignore tds_faultinjection tests in stable branch
ignore#!#tds_faultinjection
ignore#!#babel_tds_fault_injection

# Ignore upgrade tests in normal JDBC run. These are tests that cannot be run in non-upgrade contexts due
# to changing the behavior between pre- and post-commit.
ignore#!#BABEL-2934-vu-prepare
Expand Down
Loading