Skip to content

Bumping main to 9.1 #3165

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
merged 6 commits into from
Jan 31, 2025
Merged

Bumping main to 9.1 #3165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
760f352
Bumping main to 9.1
seanstory Jan 30, 2025
a08da0c
Update backports too
seanstory Jan 30, 2025
8585db7
Update NOTICE.txt
elasticmachine Jan 30, 2025
6f80748
missed some files
seanstory Jan 30, 2025
46072e1
Merge branch 'seanstory/bump-main-to-9.1' of github.com:elastic/conne…
seanstory Jan 30, 2025
f12787f
Merge branch 'main' into seanstory/bump-main-to-9.1
jedrazb Jan 31, 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
3 changes: 2 additions & 1 deletion .backportrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"targetBranchChoices": [
{ "name": "main", "checked": true },
"9.0",
"8.x",
"8.18",
"8.17",
Expand All @@ -9,7 +10,7 @@
"fork": false,
"targetPRLabels": ["backport"],
"branchLabelMapping": {
"^v9.0.0$": "main",
"^v9.1.0$": "main",
"^v8.19.0$": "8.x",
"^v(\\d+).(\\d+)(.\\d+)*$": "$1.$2"
},
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ steps:
# ----
- group: ":truck: Packaging and DRA"
key: "mbp_dra_group"
if: "(build.branch == \"main\" || build.branch == \"8.x\" || build.branch == \"8.16\" || build.branch == \"8.17\" || build.branch == \"8.18\" || build.pull_request.labels includes \"ci:packaging\")" # Add new maintenance branches here
if: "(build.branch == \"main\" || build.branch == \"9.0\" || build.branch == \"8.x\" || build.branch == \"8.16\" || build.branch == \"8.17\" || build.branch == \"8.18\" || build.pull_request.labels includes \"ci:packaging\")" # Add new maintenance branches here
depends_on:
- "lint"
- "unit_tests"
Expand Down
3 changes: 0 additions & 3 deletions .buildkite/publish/publish-common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ export SCRIPT_DIR="$CURDIR"
export BUILDKITE_DIR=$(realpath "$(dirname "$SCRIPT_DIR")")
export PROJECT_ROOT=$(realpath "$(dirname "$BUILDKITE_DIR")")

# temporary hard-coded build qualifier, this should be removed once we've released 9.0
export VERSION_QUALIFIER="${VERSION_QUALIFIER:-beta1}"
Copy link
Member Author

@seanstory seanstory Jan 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Removing this on main, since I've created a 9.0 branch where this should be for now


source $SCRIPT_DIR/git-setup.sh

VERSION_PATH="$PROJECT_ROOT/connectors/VERSION"
Expand Down
2 changes: 1 addition & 1 deletion NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3648,7 +3648,7 @@ Apache Software License


elasticsearch-connectors
9.0.0
9.1.0
Apache Software License
Elastic License 2.0

Expand Down
12 changes: 12 additions & 0 deletions catalog-info.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ spec:
branch: main
cronline: '@daily'
message: "Builds, tests, and pushes daily `main` DRA artifacts"
Daily 9.0:
branch: "9.0"
cronline: '@daily'
message: "Builds, tests, and pushes daily `9.0` DRA artifacts"
Daily 8.x:
branch: 8.x
cronline: '@daily'
Expand Down Expand Up @@ -126,6 +130,10 @@ spec:
branch: '8.x'
cronline: '@daily'
message: "Runs daily `8.x` e2e test"
Daily 9_0:
branch: '9.0'
cronline: '@daily'
message: "Runs daily `9.0` e2e test"
Daily main:
branch: main
cronline: '@daily'
Expand Down Expand Up @@ -180,6 +188,10 @@ spec:
branch: '8.x'
cronline: '@daily'
message: "Runs daily `8.x` e2e aarch64 test"
Daily 9_0:
branch: '9.0'
cronline: '@daily'
message: "Runs daily `9.0` e2e aarch64 test"
Daily main:
branch: main
cronline: '@daily'
Expand Down
2 changes: 1 addition & 1 deletion connectors/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.0.0
9.1.0
3 changes: 2 additions & 1 deletion renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"v8.16.0",
"v8.17.0",
"v8.18.0",
"v9.0.0"
"v9.0.0",
"v9.1.0"
],
"packageRules": [
{
Expand Down