Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 0.14.1 #145

Merged
merged 51 commits into from
Dec 22, 2023
Merged

Release 0.14.1 #145

merged 51 commits into from
Dec 22, 2023

Conversation

ajnelson-nist
Copy link
Member

Review notes for this PR:

  • This applies a fix against case-utils 0.5.0, mostly following the Git-Flow practice for HotFix branches. The initial patch was made from main at 0.5.0. However, the original 2010 documentation page does not include practices for HotFix patches on releases older than the current release. Other documentation, e.g. here1, demonstrates "Support" branches, but not a general practice on how to finally "Catch up" to the current main. (This is not intended as a criticism - it just seems there remains creative latitude in how to do so.)
    • This PR instead just tries to guarantee each commit passes CI, so intermediary 0.x.1 releases can be pushed expecting to pass CI.
  • There was some turbulence for backporting against releases between around 0.6.1 through around 0.10.1, due to one of the pre-commit packages encountering a known issue around that time. So, as necessary scope creep, the backported fixes include running pre-commit autoupdate fairly early on.
  • This PR targets main for a 0.14.1 release, and a sibling PR will target develop to apply the HotFix to develop and PR Additional parts for exporting local_uuid #144 .

Footnotes

  1. Participation by NIST in the creation of the documentation of mentioned software is not intended to imply a recommendation or endorsement by the National Institute of Standards and Technology, nor is it intended to imply that any specific software is necessarily the best available for the purpose.

References:
Cyber-Domain-Ontology/CDO-Utility-Local-UUID#3
Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
@ajnelson-nist
Copy link
Member Author

I'll need to restart this patch series to account for prerelease review.

@ajnelson-nist ajnelson-nist force-pushed the release-0.14.1 branch 3 times, most recently from 1990f70 to 2649290 Compare December 19, 2023 16:05
ajnelson-nist added a commit that referenced this pull request Dec 19, 2023
This enables release review for releases that precede the current
release.  This was found necessary from efforts on PR 145.

References:
* #145

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
@ajnelson-nist
Copy link
Member Author

The PR has been updated to reduce its scope and update an element of the GitHub Actions programming. It seems these are necessary to do the initially-planned prior releases.

This patch isolates a change needed to get patch-releases atop 0.5.0 to
pass `make check`.  This patch alone will not pass `make check`; see the
following octopus merge for a commit that passes `make check`.

No effects were observed on Make-managed files.

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
This patch isolates a change needed to get patch-releases atop 0.5.0 to
pass Continuous Integration.  This patch alone will not pass CI; see the
following octopus merge for a commit that passes CI.

No effects were observed on Make-managed files.

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
This patch isolates a change needed to get patch-releases atop 0.5.0 to
pass `make check`.  This patch alone will not pass `make check`; see the
following octopus merge for a commit that passes `make check`.

No effects were observed on Make-managed files.

References:
* ucoProject/UCO#373

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
This patch backports PR 99.

This patch isolates a change needed to get patch-releases atop 0.5.0 to
pass Continuous Integration.  This patch alone will not pass CI; see the
following octopus merge for a commit that passes CI.

References:
* #99

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
…sh_pre_commit', 'HotFix-0.5.1-set_rdflib-ceiling' and 'HotFix-0.5.1-add_local_rdf_toolkit' into release-0.5.1

This octopus merge brings in four isolated changes that do not
individually pass `make check` and the Continuous Integration process on
GitHub, but taken together, they do pass the test processes.  The
patches were written individually for change-explainability, and for a
planned reversion of one part as catch-up patch releases are made.

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
This enables release review for releases that precede the current
release.  This was found necessary from efforts on PR 145.

Cherry pick extra effects: This patch also cleans up some dangling
whitespace flagged by `git diff`.

References:
* #145

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
(cherry picked from commit f560e2e)
Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
This patch isolates a change needed to get patch-releases atop 0.6.0 to
pass Continuous Integration.  This patch alone will not pass CI; see the
following octopus merge for a commit that passes CI.

No effects were observed on Make-managed files.

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
This patch isolates a change needed to get patch-releases atop 0.7.0 to
pass `make check`.  This patch alone will not pass `make check`; see the
following octopus merge for a commit that passes `make check`.

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
@ajnelson-nist
Copy link
Member Author

I was incorrect on the GitHub interface programming bit. To enable Actions for support-* branches, the opened pull request needs to include the Action trigger updates, and target a branch following the support-* pattern. The pattern does not need to be in main.

So, this PR is going to get another force-push from its current state after some other PRs are resolved.

@ajnelson-nist ajnelson-nist added this to the 0.14.1 milestone Dec 20, 2023
This is a squashed commit of the non-syntax changes from PR 59.

References:
* #59

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
@ajnelson-nist ajnelson-nist mentioned this pull request Dec 20, 2023
No effects were observed on Make-managed files.

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
This patch isolates a change needed to get patch-releases atop 0.6.0 to
pass Continuous Integration.  This patch alone will not pass CI; see the
following octopus merge for a commit that passes CI.

No effects were observed on Make-managed files.

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
This patch isolates a change needed to get patch-releases atop 0.9.0 to
pass `make check`.  This patch alone will not pass `make check`; see the
following octopus merge for a commit that passes `make check`.

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
…andas_ceiling' and 'support-0.8.x' into release-0.9.1
Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
No effects were observed on Make-managed files.

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
No effects were observed on Make-managed files.

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
@ajnelson-nist
Copy link
Member Author

This PR is ready for review and merge once CI passes.

The sibling PR into develop, #150 , follows the Git-Flow merge pattern for HotFix branches, but has a merge conflict that would be inappropriate to resolve before merging this PR (145) into main. So, can 145 please be merged first, and then I'll handle catching up this release branch to merge into develop.

@ajnelson-nist ajnelson-nist marked this pull request as ready for review December 22, 2023 21:01
@ajnelson-nist ajnelson-nist requested a review from a team as a code owner December 22, 2023 21:02
@ajnelson-nist
Copy link
Member Author

I'll handle stamping the 0.7.1 ... 0.14.1 releases after this is merged.

@kchason kchason merged commit 80551f4 into main Dec 22, 2023
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants