Skip to content

Commit

Permalink
Merge pull request #2094 from evgenyz/fix-main-refs
Browse files Browse the repository at this point in the history
Fix references to the development branch (main)
  • Loading branch information
Mab879 authored Jun 3, 2024
2 parents 37841c3 + b2296d9 commit ae325bf
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfiles/test_suite
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/manual/manual.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions release_tools/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -98,7 +98,7 @@ The last commit before the release has to have the `openscap-<version>` 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.
+
Expand Down

0 comments on commit ae325bf

Please sign in to comment.