Skip to content

[OSS-ONLY] Finalise BABEL_2_15_STABLE #4133

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

Merged
jsudrik merged 2 commits into from
Oct 1, 2025
Merged

[OSS-ONLY] Finalise BABEL_2_15_STABLE #4133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0101f52
[OSS-ONLY] Finalise BABEL_2_15_STABLE
lohia-shalini Oct 1, 2025
61a893f
Empty-Commit
lohia-shalini Oct 1, 2025
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_2_X_DEV__PG_14_X
DEFAULT_BRANCH=BABEL_2_15_STABLE__PG_14_20
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: postgres13
NEW_INSTALL_DIR: postgres14
ENGINE_BRANCH_FROM: BABEL_1_X_DEV__PG_13_X
EXTENSION_BRANCH_FROM: BABEL_1_X_DEV
ENGINE_BRANCH_FROM: BABEL_1_5_STABLE__PG_13_9
EXTENSION_BRANCH_FROM: BABEL_1_5_STABLE

runs-on: ubuntu-22.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)

# 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 @@ -17,6 +17,10 @@ ignore#!#test_search_path
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