Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.git
target
docs
examples
pg_dump_anon
**/_build
6 changes: 6 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,9 @@ include:
- local: .gitlab/job_templates/coverage.yml
inputs:
pgver: pg17
## Dalibo Specific jobs
- local: dalibo/.gitlab-ci.yml
rules:
- exists:
- dalibo/.gitlab-ci.yml

28 changes: 28 additions & 0 deletions .gitlab/issue_templates/Release.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

* [ ] Check that **all** CI jobs run without errors on the `latest` branch
* [ ] Close all remaining issues on the current milestone
* [ ] Update the [Changelog]
* [ ] Update the [AUTHORS.md] list
* [ ] Write the announcement in [NEWS.md]
* [ ] Rebuild the docker image `latest` and upload it
(`make docker_image docker_push`)
* [ ] Close the current milestone and open the next one
* [ ] Rebase the `stable` branch from `latest`
* [ ] Rebuild the docker image `stable` and upload it
(`DOCKER_TAG=stable make docker_image docker_push`)
* [ ] Tag the `latest` branch
* [ ] Build the docker image `x.y.z` and upload it
(`DOCKER_TAG=x.y.z make docker_image docker_push`)
* [ ] Create a branch `x.y.z` based on `stable`
* [ ] Launch [a new pipeline] on the `x.y.z` branch
* [ ] Once the pipeline is done, trigger the deploy task to publish the packages
* [ ] Update the upstream repositories
* [ ] On the [Tags page], click on `Create a Release`
* [ ] Bump to the new version number in [Cargo.toml]
* [ ] Publish the announcement

[Changelog]: CHANGELOG.md
[NEWS.md]: NEWS.md
[Cargo.toml]: Cargo.toml
[Tags page]: https://gitlab.com/dalibo/postgresql_anonymizer/-/tags/
[a new pipeline]: https://gitlab.com/dalibo/postgresql_anonymizer/-/pipelines/new
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repos:
rev: v0.13.0
hooks:
- id: markdownlint
exclude: docs/(dev|how-to)
exclude: docs/(dev|how-to|tutorials|runbooks)
- repo: local
hooks:
- id: rustfmt
Expand Down
7 changes: 5 additions & 2 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,12 @@ help of many contributors.
Contributors
-------------------------------------------------------------------------------

* Pierre Giraud: Proofreading
* Benoit Lobréau: Prototyping, Code Review
* Robin Portigliatti: Tutorials
* Suhas Thalanki: Build on Mac OS X
* Daniel Solsona: Feature idea
* Jukka Heiskanen: Bug report and analysis
* Jukka Heiskanen: Bug reports and analysis
* Julien Acroute: Documentation
* Philip Olson: Documentation
* Anthony Dumontois: Documentation
Expand Down Expand Up @@ -72,7 +76,6 @@ Contributors
* Matthieu Larcher (@somatt) : Bug reports
* Nikolay Samokhvalov (@NikolayS) : Bug fix + Documentation
* Gunnar "Nick" Bluth (@nickbluth) : Some additional functions
* Yann ROBIN (@me.show) : version() function and DBAAS install
* Ilya Gorbunov (@dAverk) : Bug fixes
* Peter Neave (@peterneave) : Typos
* Yann Robin (@me.show) : version() function and DBAAS install
Expand Down
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,16 @@ CHANGELOG

<!-- git log --oneline $(git describe --tags --abbrev=0 @^)..@ -->

WIP : 2.3.0 - Parallel Static Masking
20250702 : 2.3.0 - Parallel Static Masking
-------------------------------------------------------------------------------

* [docs] Various corrections on the tutorial (Robin Portigliatti)
* [random] FIX #527 issue with negative numbers
* [make] build on Mac OS X (Suhas Thalanki)
* [doc] How to truncate a table for masked users
* [replica] Introducing Replica Masking (ALPHA)
* [tests] make ldm test more robust
* [doc] hash and unescaped chars

20250530 : 2.2.1 - packaging fixup
-------------------------------------------------------------------------------
Expand Down
33 changes: 9 additions & 24 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Where to start ?

If you want to help, here's a few ideas :

1- **Testing** : You can install the `master` branch of the project and realize
1- **Testing** : You can install the `latest` branch of the project and realize
extensive tests based on your use case. This is very useful to improve the
stability of the code. Eventually if you can publish you test cases, please
add them in the `/tests/sql` directory or in `demo`. I have recently
Expand Down Expand Up @@ -54,17 +54,17 @@ Add a new remote to your local repo:
git remote add upstream https://gitlab.com/dalibo/postgresql_anonymizer.git
```

### Keep your master branch up to date
### Keep your `latest` branch up to date

At any time, you can mirror your personal repo like this:

```bash
# switch to the master branch
git checkout master
# download the latest commit from the main repo
# switch to the latest branch
git checkout latest
# download the latest commits from the upstream repo
git fetch upstream
# apply the latest commits
git rebase upstream/master
# apply the commits
git rebase upstream/latest
# push the changes to your personal repo
git push origin
```
Expand All @@ -82,7 +82,7 @@ git checkout foo
# download the latest commit from the main repo
git fetch upstream
# apply the latest commits
git rebase upstream/master
git rebase upstream/latest
# push the changes to your personal repo
git push origin --force-with-lease
```
Expand Down Expand Up @@ -385,19 +385,4 @@ they are not `SECURITY DEFINER`.
Publishing a new Release
--------------------------------------------------------------------------------

* [ ] Check that **all** CI jobs run without errors on the `master` branch
* [ ] Close all remaining issues on the current milestone
* [ ] Update the [Changelog]
* [ ] Write the announcement in [NEWS.md]
* [ ] Rebuild the docker image and upload it (`make docker_image docker_push`)
* [ ] Upload the zipball to PGXN
* [ ] Close the current milestone and open the next one
* [ ] Tag the `latest` branch
* [ ] Rebase the `stable` branch from `latest`
* [ ] Publish the RPM/DEB packages
* [ ] Bump to the new version number in [Cargo.toml]
* [ ] Publish the announcement

[Changelog]: CHANGELOG.md
[NEWS.md]: NEWS.md
[Cargo.toml]: Cargo.toml
See .gitlab/issue_templates/Release.md
Loading