diff --git a/Dockerfiles/test_suite b/Dockerfiles/test_suite index b6708f6de4..42a055dfd1 100644 --- a/Dockerfiles/test_suite +++ b/Dockerfiles/test_suite @@ -8,7 +8,7 @@ # # where ID in the $PR environment variable is the pull request (PR) ID, # if ID would not be set (-e option omitted) tests will be run from the -# default branch (maint-1.3). +# default branch (main). # # Once tests are finished it is possible to enter the container: # podman start pr_test diff --git a/README.md b/README.md index 9ef1014968..13c6f4551d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # OpenSCAP -[![Gating](https://github.com/OpenSCAP/openscap/actions/workflows/build.yml/badge.svg?branch=maint-1.3)](https://github.com/OpenSCAP/openscap/actions/workflows/build.yml) +[![Gating](https://github.com/OpenSCAP/openscap/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/OpenSCAP/openscap/actions/workflows/build.yml) [![Join the chat at https://gitter.im/OpenSCAP/openscap](https://badges.gitter.im/OpenSCAP/openscap.svg)](https://gitter.im/OpenSCAP/openscap?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) Open Source Security Compliance Solution diff --git a/docs/manual/manual.adoc b/docs/manual/manual.adoc index 1a78406dd2..0c995218b0 100644 --- a/docs/manual/manual.adoc +++ b/docs/manual/manual.adoc @@ -5,7 +5,7 @@ :sce_web: https://www.open-scap.org/features/other-standards/sce/ :openscap_web: https://open-scap.org/ :oscap_git: https://github.com/OpenSCAP/openscap -:devel_manual: https://github.com/OpenSCAP/openscap/blob/maint-1.3/docs/developer/developer.adoc +:devel_manual: https://github.com/OpenSCAP/openscap/blob/main/docs/developer/developer.adoc :ssg_git: https://github.com/OpenSCAP/scap-security-guide :xmlsec: https://www.aleksey.com/xmlsec/ :xslt: http://www.w3.org/TR/xslt diff --git a/release_tools/README.adoc b/release_tools/README.adoc index 16d9e71520..5f9e737611 100644 --- a/release_tools/README.adoc +++ b/release_tools/README.adoc @@ -12,7 +12,7 @@ When releasing alpha/pre-releases, please keep in mind how RPM handles the versi . Ensure the project is in a good shape for the release + -* Check CI is passing in https://github.com/OpenSCAP/openscap/actions?query=branch%3Amaint-1.3+event%3Apush[GitHub Actions] +* Check CI is passing in https://github.com/OpenSCAP/openscap/actions?query=branch%3Amain+event%3Apush[GitHub Actions] * Check builds in https://dashboard.packit.dev/projects/github.com/OpenSCAP/openscap[Packit] are successful. . Clone a clean `openscap` repository: @@ -98,7 +98,7 @@ The last commit before the release has to have the `openscap-` message Tag the commit and push the changes to upstream. You need to be allowed to push without pull requests in the GitHub repository settings. + git tag $version - git push origin maint-1.3 + git push origin main . Create tarballs and GitHub release. +