Skip to content

Commit f2cf881

Browse files
authored
Merge pull request #1000 from percona/release-2.6.0
Release 2.6.0
2 parents e189b5b + 5a8140a commit f2cf881

File tree

540 files changed

+23679
-32035
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

540 files changed

+23679
-32035
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ indent_size = 4
77
trim_trailing_whitespace = true
88
insert_final_newline = true
99

10-
[*.js,json,yml,yaml]
10+
[*.{json,yml,yaml}]
1111
indent_size = 2
1212

1313
[{Makefile,go.mod,go.sum,*.go}]

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ jobs:
3232
strategy:
3333
fail-fast: false
3434
matrix:
35-
psmdb: ["4.4", "5.0", "6.0", "7.0"]
35+
psmdb: ["5.0", "6.0", "7.0"]
3636
test: [logical, physical, incremental, external]
3737
env:
3838
PBM_BRANCH: ${{ github.event.inputs.pbm_branch || 'main' }}
39-
GO_VER: ${{ github.event.inputs.go_ver || 'bullseye' }}
39+
GO_VER: ${{ github.event.inputs.go_ver || '1.22-bullseye' }}
4040
PR_NUMBER: ${{ github.event.number|| github.event.inputs.pr_ver }}
4141

4242
steps:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.env
22
.vscode/*
33
!.vscode/settings.json
4+
!.vscode/extensions.json
45
.idea/
56
/bin/
67
/.dev

.vscode/extensions.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"recommendations": ["golang.go", "aleksandra.go-group-imports"]
3+
}

.vscode/settings.json

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,35 @@
22
"[go]": {
33
"editor.defaultFormatter": "golang.go",
44
"editor.insertSpaces": false,
5-
"editor.tabSize": 4,
5+
"editor.tabSize": 4
66
},
77
"[json][jsonc][yaml]": {
88
"editor.insertSpaces": true,
9-
"editor.tabSize": 2,
9+
"editor.tabSize": 2
1010
},
1111
"[shellscript]": {
1212
"editor.insertSpaces": false,
13-
"editor.tabSize": 4,
13+
"editor.tabSize": 4
1414
},
15+
"files.encoding": "utf8",
1516
"files.eol": "\n",
1617
"files.insertFinalNewline": true,
1718
"files.trimFinalNewlines": true,
1819
"files.trimTrailingWhitespace": true,
1920
"go.formatTool": "gofumpt",
21+
"go.formatFlags": [
22+
"-extra"
23+
],
2024
"go.lintTool": "golangci-lint",
2125
"go.useLanguageServer": true,
2226
"gopls": {
2327
"analyses": {
2428
"composites": false,
25-
"deepequalerrors": false
29+
"fieldalignment": false
2630
},
2731
"formatting.gofumpt": true,
28-
"formatting.local": "github.com/percona"
32+
"formatting.local": "github.com/percona",
33+
"ui.semanticTokens": true
2934
},
30-
"groupImports.onSave": true,
3135
"shellformat.flag": "-bn -ci -s"
3236
}

CONTRIBUTING.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ Percona Backup for MongoDB (PBM) is a distributed, low-impact solution for achie
1212

1313
You can contribute in one of the following ways:
1414

15-
1. Reach us on our [Forums](https://forums.percona.com) and [Discord]([https://discord.gg/mQEyGPkNbR](https://discord.gg/mQEyGPkNbR)).
16-
2. [Submit a bug report or a feature request](https://github.com/percona/percona-backup-mongodb/blob/main/README.md)
15+
1. Reach us on our [Forums](https://forums.percona.com/c/mongodb/percona-backup-for-mongodb).
16+
2. [Submit a bug report or a feature request](https://jira.percona.com/projects/PBM)
1717
3. Submit a pull request (PR) with the code patch
1818
4. Contribute to documentation
1919

@@ -23,7 +23,7 @@ Before submitting code contributions, we ask you to complete the following prere
2323

2424
### 1. Sign the CLA
2525

26-
Before you can contribute, we kindly ask you to sign our [Contributor License Agreement](https://cla-assistant.percona.com/<linktoCLA>) (CLA). You can do this in on click using your GitHub account.
26+
Before you can contribute, we kindly ask you to sign our [Contributor License Agreement](https://cla-assistant.percona.com/percona/percona-backup-mongodb) (CLA). You can do this in on click using your GitHub account.
2727

2828
**Note**: You can sign it later, when submitting your first pull request. The CLA assistant validates the PR and asks you to sign the CLA to proceed.
2929

@@ -53,7 +53,7 @@ Otherwise, we will contact you for additional information or with the request to
5353

5454
To build Percona Backup for MongoDB from source code, you require the following:
5555

56-
* Go 1.11 or above. See [Installing and setting up Go tools](
56+
* Go 1.22 or above. See [Installing and setting up Go tools](
5757
https://golang.org/doc/install) for more information
5858
* make
5959
* ``krb5-devel`` for Red Hat Enterprise Linux / CentOS or ``libkrb5-dev`` for Debian / Ubuntu. This package is required for Kerberos authentication in Percona Server for MongoDB.
@@ -101,26 +101,26 @@ You can find the tests in the ``e2e-tests`` directory.
101101
To save time on tests execution during development, we recommend running general and consistency tests for a sharded cluster:
102102

103103
```sh
104-
$ MONGODB_VERSION=4.4 ./run-sharded
104+
$ MONGODB_VERSION=5.0 ./run-sharded
105105
```
106106

107-
``$ MONGODB_VERSION`` stands for the Percona Server for MongoDB version Percona Backup for MongoDB is running with. Default is 4.4.
107+
``$ MONGODB_VERSION`` stands for the Percona Server for MongoDB version Percona Backup for MongoDB is running with. Default is 5.0.
108108

109109
After the development is complete and you are ready to submit a pull request, run all tests using the following command:
110110

111111
```sh
112-
$ MONGODB_VERSION=4.4 ./run-all
112+
$ MONGODB_VERSION=5.0 ./run-all
113113
```
114114

115115
You can run tests on your local machine with whatever operating system you have. After you submit the pull request, we will check your patch on multiple operating systems.
116116

117117
## Contributing to documentation
118118

119-
We welcome contributions to our [documentation](https://docs.percona.com/percona-backup-mongodb/index.html).
119+
We welcome contributions to our [documentation](https://docs.percona.com/percona-backup-mongodb).
120120

121121
Documentation source files are in the [dedicated docs repository](https://github.com/percona/pbm-docs). The contents of the `doc` folder is outdated and will be removed.
122122

123-
Please follow the [Docs contributing guidelines](https://github.com/percona/pbm-docs/CONTRBUTING.md) for how to contribute to documentation.
123+
Please follow the [Docs contributing guidelines](https://github.com/percona/pbm-docs/blob/main/CONTRIBUTING.md) for how to contribute to documentation.
124124

125125
## After your pull request is merged
126126

0 commit comments

Comments
 (0)