Skip to content

Commit

Permalink
Merge pull request #1000 from percona/release-2.6.0
Browse files Browse the repository at this point in the history
Release 2.6.0
  • Loading branch information
boris-ilijic authored Sep 2, 2024
2 parents e189b5b + 5a8140a commit f2cf881
Show file tree
Hide file tree
Showing 540 changed files with 23,679 additions and 32,035 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ indent_size = 4
trim_trailing_whitespace = true
insert_final_newline = true

[*.js,json,yml,yaml]
[*.{json,yml,yaml}]
indent_size = 2

[{Makefile,go.mod,go.sum,*.go}]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ jobs:
strategy:
fail-fast: false
matrix:
psmdb: ["4.4", "5.0", "6.0", "7.0"]
psmdb: ["5.0", "6.0", "7.0"]
test: [logical, physical, incremental, external]
env:
PBM_BRANCH: ${{ github.event.inputs.pbm_branch || 'main' }}
GO_VER: ${{ github.event.inputs.go_ver || 'bullseye' }}
GO_VER: ${{ github.event.inputs.go_ver || '1.22-bullseye' }}
PR_NUMBER: ${{ github.event.number|| github.event.inputs.pr_ver }}

steps:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.env
.vscode/*
!.vscode/settings.json
!.vscode/extensions.json
.idea/
/bin/
/.dev
Expand Down
3 changes: 3 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"recommendations": ["golang.go", "aleksandra.go-group-imports"]
}
16 changes: 10 additions & 6 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,35 @@
"[go]": {
"editor.defaultFormatter": "golang.go",
"editor.insertSpaces": false,
"editor.tabSize": 4,
"editor.tabSize": 4
},
"[json][jsonc][yaml]": {
"editor.insertSpaces": true,
"editor.tabSize": 2,
"editor.tabSize": 2
},
"[shellscript]": {
"editor.insertSpaces": false,
"editor.tabSize": 4,
"editor.tabSize": 4
},
"files.encoding": "utf8",
"files.eol": "\n",
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"files.trimTrailingWhitespace": true,
"go.formatTool": "gofumpt",
"go.formatFlags": [
"-extra"
],
"go.lintTool": "golangci-lint",
"go.useLanguageServer": true,
"gopls": {
"analyses": {
"composites": false,
"deepequalerrors": false
"fieldalignment": false
},
"formatting.gofumpt": true,
"formatting.local": "github.com/percona"
"formatting.local": "github.com/percona",
"ui.semanticTokens": true
},
"groupImports.onSave": true,
"shellformat.flag": "-bn -ci -s"
}
18 changes: 9 additions & 9 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Percona Backup for MongoDB (PBM) is a distributed, low-impact solution for achie

You can contribute in one of the following ways:

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

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

### 1. Sign the CLA

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.
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.

**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.

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

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

* Go 1.11 or above. See [Installing and setting up Go tools](
* Go 1.22 or above. See [Installing and setting up Go tools](
https://golang.org/doc/install) for more information
* make
* ``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.
Expand Down Expand Up @@ -101,26 +101,26 @@ You can find the tests in the ``e2e-tests`` directory.
To save time on tests execution during development, we recommend running general and consistency tests for a sharded cluster:

```sh
$ MONGODB_VERSION=4.4 ./run-sharded
$ MONGODB_VERSION=5.0 ./run-sharded
```

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

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

```sh
$ MONGODB_VERSION=4.4 ./run-all
$ MONGODB_VERSION=5.0 ./run-all
```

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.

## Contributing to documentation

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

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.

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

## After your pull request is merged

Expand Down
Loading

0 comments on commit f2cf881

Please sign in to comment.