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

'Rolling Tag' logic for pre/release builds #47

Merged
merged 4 commits into from
Feb 26, 2024
Merged

Conversation

CodeGat
Copy link
Contributor

@CodeGat CodeGat commented Feb 8, 2024

In this PR:

 * cd.yml: Moved tagging logic to before deployment

  • ci.yml: Added tagging logic to before prerelease deployment

This fixes up the issue of the spack.yaml file (specifically, the spack.specs access-om2@git.tag) looking to clone the tag that doesn't exist (yet). We add a rolling tag for the prerelease branch so the build can progress, and then when it is merged, place the tag in it's rightful position on the main branch.

This 'rolling tag' logic is noted here:

gitGraph
  commit tag: "2024.01.1"
  branch pre-2024.02.1
  commit tag: "2024.02.1"
Loading

And then when the next commit comes along:

gitGraph
  commit tag: "2024.01.1"
  branch pre-2024.02.1
  commit
  commit tag: "2024.02.1"
Loading

and then when merged:

gitGraph
  commit tag: "2024.01.1"
  branch pre-2024.02.1
  commit
  commit
  checkout main
  merge pre-2024.02.1 tag: "2024.02.1"
Loading

@CodeGat CodeGat self-assigned this Feb 8, 2024
@CodeGat
Copy link
Contributor Author

CodeGat commented Feb 19, 2024

Prerelease looks like this:

gitGraph
  commit id: "2024.01.1" type: HIGHLIGHT tag: "2024.01.01"
  branch pre-2024.01.2
  checkout pre-2024.01.2
  commit id: "access-om2_2024.01.2-1"
  commit id: "access-om2_2024.01.2-2"
  commit id: "access-om2_2024.01.2-3"
  checkout main
  merge pre-2024.01.2 id: "2024.01.2" type: HIGHLIGHT tag: "2024.01.2"
Loading

Copy link
Member

@aidanheerdegen aidanheerdegen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to merge and test.

@CodeGat CodeGat merged commit 129865a into main Feb 26, 2024
@CodeGat CodeGat deleted the tag-before-deploy-fix branch February 26, 2024 22:32
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.

None yet

2 participants