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

github workflow: update action #77

Closed
wants to merge 1 commit into from
Closed

Conversation

axel-h
Copy link
Contributor

@axel-h axel-h commented Jan 30, 2024

Avoid CI warning that node.js 16 is deprecated.

See https://github.com/riscv/riscv-cheri/actions/runs/7714759013: Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: actions/upload-artifact@v3. For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.

Avoid CI warning that node.js 16 is deprecated.

Signed-off-by: Axel Heider <[email protected]>
@jrtc27
Copy link
Collaborator

jrtc27 commented Jan 30, 2024

Can we instead just sync with riscv/docs-spec-template again, which does include this fix among a bunch of other changes, rather than repeating the same fixes ourselves as the template?

@axel-h
Copy link
Contributor Author

axel-h commented Jan 30, 2024

Sure, makes sense. I'm not an expert on the processes here. This PR just came along with the same changes on a few other repos to get rid of the warning.

@arichardson
Copy link
Collaborator

In my latest PR I did not merge with the templates repo since all of its history was squashed into the first commit of this repo. I could do a merge with --allow-unrelated-histories, so that future updates are simpler. @jrtc27 what do you think is the right approach? Should we continue diffing the files to the template and pulling over patches or do the merge?

@jrtc27
Copy link
Collaborator

jrtc27 commented Jan 30, 2024

In my latest PR I did not merge with the templates repo since all of its history was squashed into the first commit of this repo.

Thanks GitHub...

I could do a merge with --allow-unrelated-histories, so that future updates are simpler. @jrtc27 what do you think is the right approach? Should we continue diffing the files to the template and pulling over patches or do the merge?

Merging seems like the best approach going forwards, other than GitHub PRs not handling merge commits... although given people seem to be using "Create a merge commit" for PRs I guess it might actually work ok?

@arichardson
Copy link
Collaborator

In my latest PR I did not merge with the templates repo since all of its history was squashed into the first commit of this repo.

Thanks GitHub...

I could do a merge with --allow-unrelated-histories, so that future updates are simpler. @jrtc27 what do you think is the right approach? Should we continue diffing the files to the template and pulling over patches or do the merge?

Merging seems like the best approach going forwards, other than GitHub PRs not handling merge commits... although given people seem to be using "Create a merge commit" for PRs I guess it might actually work ok?

Sounds good, I'll give this a try now.

@axel-h
Copy link
Contributor Author

axel-h commented Jan 30, 2024

Closing this PR, because #79 will handle this.

@axel-h axel-h closed this Jan 30, 2024
@axel-h axel-h deleted the patch-axel-4 branch January 30, 2024 18:52
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.

3 participants