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

Update publish_v3.yml to alias "v3.0" (and later "v3.0.1") as "latest" #950

Merged
merged 11 commits into from
Jul 18, 2024

Conversation

bact
Copy link
Collaborator

@bact bact commented Apr 28, 2024

.github/workflows/publish_v3.yml:

  • Update alias argument for mike deploy to have v3.0 as the latest
    • v3.0 was aliased as v3-draft, so v2.3 still occupied the latest alias.

mkdocs.yml:

Will fix #949

Update `alias` argument for  `mike deploy` to have `v3.0` as the `latest`

`v3.0` was aliased as `v3-draft`, so `v2.3` still keep the `latest` alias.

Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
Copy link
Member

@goneall goneall left a comment

Choose a reason for hiding this comment

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

LGTM

@goneall
Copy link
Member

goneall commented Apr 30, 2024

@licquia - could you do a quick review

@goneall goneall added this to the 3.0.1 milestone Apr 30, 2024
@goneall
Copy link
Member

goneall commented Apr 30, 2024

@bact @licquia - note the related PR #934 - can we combine these into one PR?

@bact
Copy link
Collaborator Author

bact commented Apr 30, 2024

@goneall @licquia Yes. If we don't plan to build docs for 3.0 again, I think it make sense to move over changes in this PR (publish_v3.yml and mkdocs.yml) to the PR #934, targeting 3.0.1.

bact and others added 3 commits May 3, 2024 17:27
@bact
Copy link
Collaborator Author

bact commented May 6, 2024

@goneall Updated. Bring in changes for 3.0.1 by @licquia from PR #934 to here.

@goneall
Copy link
Member

goneall commented May 6, 2024

Thanks @bact - @licquia and/or @zvr - if you could do a quick review, we can merge

@bact
Copy link
Collaborator Author

bact commented May 6, 2024

I'm not sure if we like to merge this at this time, since it has the tag latest and if the workflow starts it will publish the unfinished v3.0.1 - which I don't think we like it like that.

Normally, latest should point to the latest stable release, which is currently v3.0.

See more thoughts on this in next comment.

@bact
Copy link
Collaborator Author

bact commented May 6, 2024

I'm try to rethink and find what more logical is:

  1. on every branches, set canonical_version to latest
    • mkdocs.yml:
      - mike:
        canonical_version: latest
  2. on development/v3.0 branch, set checkout to use 3.0 tag of model
    • publish_v3.yml:
      - uses: actions/checkout@f4...44 # v3
        with:
          repository: spdx/spdx-3-model
          ref: 3.0
          path: spdx-3-model
  3. on development/v3.0 branch, set latest alias to point to v3.0 version
    • publish_v3.yml:
      run: mike deploy -u -b gh-pages -p v3.0 latest
  4. on development/v3.0 branch, run the publish workflow to have the proper latest on the current stable release (v3.0)
    • The reason that we may need to run the publish workflow of v3.0 again is to fix things like PRs 928, 943, 950, 958, 959 (clearly not a change in content; only web navigation structure or typos; so they are not v3.0.1)
  5. on development/v3.0.1 branch, set the version (for mkdocs) to v3.0.1-draft (or v3.0.1-RCxxx) (an alias can be added, if needed)
    • publish_v3.yml:
      run: mike deploy -u -b gh-pages -p v3.0.1-draft
    • The CI will checkout from main branch (development branch)
    • The CI will publish the unfinished v3.01 to v3.0.1-draft version (selectable from dropdown list in HTML)
  6. (once v3.0.1 is ready) on spdx-3-model repo, release it using the tag 3.0.1
  7. (once v3.0.1 is ready) on development/v3.0.1 branch, set checkout to use 3.0.1 tag
    • publish_v3.yml:
      - uses: actions/checkout@f4...44 # v3
        with:
          repository: spdx/spdx-3-model
          ref: 3.0.1
          path: spdx-3-model
  8. (once v3.0.1 is ready) on development/v3.0.1 branch, publish it with 3.0.1 version, with the alias latest
    • publish_v3.yml:
      run: mike deploy -u -b gh-pages -p v3.0.1 latest 
  9. (once v3.0.1 is ready) on development/v3.0.1 branch, run the publish workflow to have the proper latest on the current stable release (now v3.0.1)

If this is correct and agreed:

  • I should close this PR to and open a new pull request with content in (1)-(3) in development/v3.0 branch. That new PR will be reviewed and merged before (4).
  • PR Update CI to build from and generate 3.0.1. #934 can be modified to be (5) and merge now, with the target of using it during the development period of v3.0.1
  • Once v3.0.1 is ready, another PR with the content from (6)-(8) should be open and merge before (9)

--

Note: The content of (2)-(3) is PR #950 before the merge with #934 (this PR at the commit d44e0a6) but it should be on development/v3.0 branch instead.

@bact bact changed the title Update publish_v3.yml to alias "v3.0" as "latest" Update publish_v3.yml to alias "v3.0" (and later "v3.0.1") as "latest" May 7, 2024
Copy link
Collaborator

@licquia licquia left a comment

Choose a reason for hiding this comment

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

With this change, we will be advertising 3.0.1 as the latest; if we want to change that, we can do that with a slight change and some manual runs of mike. But I think we should go forward with this at least as a first step.

@bact
Copy link
Collaborator Author

bact commented Jul 2, 2024

copyright: DRAFT version generated from d25ae89 (model) by 85e8d65 (parser)

@bact
Copy link
Collaborator Author

bact commented Jul 2, 2024

With this change, we will be advertising 3.0.1 as the latest; if we want to change that, we can do that with a slight change and some manual runs of mike. But I think we should go forward with this at least as a first step.

@licquia Also, this workflow need to be slightly adjusted once #978 and #979 are implemented - but I agree that we can take this PR as a first step and then having new PRs for new features.

Copy link
Member

@zvr zvr left a comment

Choose a reason for hiding this comment

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

No third-level number in URL

.github/workflows/publish_v3.yml Show resolved Hide resolved
Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>

Co-authored-by: Alexios Zavras (zvr) <zvr+git@zvr.gr>
Copy link
Member

@zvr zvr left a comment

Choose a reason for hiding this comment

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

always use 3 levels

.github/workflows/publish_v3.yml Outdated Show resolved Hide resolved
Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>

Co-authored-by: Alexios Zavras (zvr) <zvr+git@zvr.gr>
@bact bact requested a review from zvr July 16, 2024 16:45
@bact
Copy link
Collaborator Author

bact commented Jul 16, 2024

Discussed in 2024-07-16 Tech team meeting - ready to merge.

@zvr zvr merged commit d824ad0 into spdx:development/v3.0.1 Jul 18, 2024
3 checks passed
@bact bact deleted the update-latest-alias branch July 18, 2024 06:56
This was referenced Jul 18, 2024
@bact
Copy link
Collaborator Author

bact commented Jul 18, 2024

The deployment was failed because v2.3 still occupied "latest" alias. Need to use -u option in mike deploy to override that.

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.

https://spdx.github.io/spdx-spec/latest/ redirects to v2.3
4 participants