Skip to content

Commit 207f9c6

Browse files
Copilotjsturtevant
andcommitted
Address review feedback: update copyright year to 2025, simplify docs, use just in CI, remove markdownlint config
- Remove .markdownlint.json file as it wasn't being used - Update copyright year from 2024 to 2025 in license header check script and all files with license headers - Simplify docs/commit-signing.md to remove duplication and reference GitHub's documentation - Update CONTRIBUTING.md to reference GitHub docs instead of duplicating GPG setup instructions - Update CI workflow to use `just check-license-headers` for consistency Co-authored-by: jsturtevant <[email protected]>
1 parent 33d19fc commit 207f9c6

File tree

17 files changed

+42
-167
lines changed

17 files changed

+42
-167
lines changed

.github/workflows/ValidatePullRequest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
steps:
7474
- uses: actions/checkout@v4
7575
- name: Check License Headers
76-
run: ./dev/check-license-headers.sh
76+
run: just check-license-headers
7777

7878
# Gate PR merges on this specific "join-job" which requires all other
7979
# jobs to run first. We need this job since we cannot gate on particular jobs

.markdownlint.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -80,26 +80,20 @@ git commit -s -m 'This is my commit message'
8080

8181
**For GPG Signatures:**
8282

83-
GPG signatures verify the identity of the committer. To set up GPG signing:
83+
GPG signatures verify the identity of the committer. For detailed setup instructions, see GitHub's documentation on [signing commits](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits).
8484

85-
1. Generate a GPG key and configure Git to use it:
85+
Quick setup:
8686

87-
```sh
88-
git config --global user.signingkey YOUR_KEY_ID
89-
git config --global commit.gpgsign true
90-
```
91-
92-
2. Sign commits with the `-S` flag (or rely on the automatic signing from the above configuration):
93-
94-
```sh
95-
git commit -S -m 'This is my signed commit message'
96-
```
87+
```sh
88+
git config --global user.signingkey YOUR_KEY_ID
89+
git config --global commit.gpgsign true
90+
```
9791

98-
3. For both DCO sign-off and GPG signature in one command:
92+
**For both DCO sign-off and GPG signature in one command:**
9993

100-
```sh
101-
git commit -S -s -m 'This is my signed and signed-off commit message'
102-
```
94+
```sh
95+
git commit -S -s -m 'This is my signed and signed-off commit message'
96+
```
10397

10498
For detailed instructions on setting up both signature types, see [docs/commit-signing.md](./docs/commit-signing.md).
10599

@@ -117,16 +111,6 @@ git commit --amend --no-edit -S -s
117111
git push --force-with-lease <remote-name> <branch-name>
118112
```
119113

120-
**For fixing multiple commits:**
121-
122-
```sh
123-
git rebase -i HEAD~n # Replace n with the number of commits to fix
124-
# Change 'pick' to 'edit' for each commit
125-
# For each commit:
126-
git commit --amend --no-edit -S -s
127-
git rebase --continue
128-
```
129-
130114
For more detailed instructions on fixing commits, see [docs/commit-signing.md](./docs/commit-signing.md).
131115

132116
### Rust Analyzer

dev/check-license-headers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LICENSE_PATTERN="Copyright .* The Hyperlight Authors..*Licensed under the Apache
1010

1111
# Define the full license header for files that need it
1212
LICENSE_HEADER='/*
13-
Copyright 2024 The Hyperlight Authors.
13+
Copyright 2025 The Hyperlight Authors.
1414
1515
Licensed under the Apache License, Version 2.0 (the "License");
1616
you may not use this file except in compliance with the License.

docs/commit-signing.md

Lines changed: 18 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -1,164 +1,59 @@
11
# Commit Signing Requirements
22

3-
This document explains how to ensure your commits comply with both the Developer Certificate of Origin (DCO) requirements and GPG signing requirements for this project.
3+
This document explains the commit signing requirements for this project.
44

5-
## What is the DCO?
6-
7-
The Developer Certificate of Origin (DCO) is a lightweight way for contributors to certify that they wrote or otherwise have the right to submit the code they are contributing to the project. See the full text in the [CONTRIBUTING.md](../CONTRIBUTING.md#developer-certificate-of-origin-signing-your-work) file.
8-
9-
## Two Required Signature Types
5+
## Required Signatures
106

117
All commits to this repository must have two types of signatures:
128

139
1. **DCO Sign-off**: A `Signed-off-by` line in the commit message
1410
2. **GPG Signature**: A cryptographic signature verifying the committer's identity
1511

16-
## Adding DCO Sign-offs to Commits
17-
18-
All commits must include a `Signed-off-by` line in the commit message. This line certifies that you have the right to submit your contribution under the project's license.
12+
## DCO Sign-off
1913

20-
### Using the -s Flag
21-
22-
The simplest way to add a sign-off to your commits is to use the `-s` flag with the `git commit` command:
14+
Add a DCO sign-off to your commits using the `-s` flag:
2315

2416
```sh
2517
git commit -s -m "Your commit message"
2618
```
2719

28-
This will automatically add a `Signed-off-by` line with your name and email to the commit message.
29-
30-
### Configuring Git for Automatic Sign-offs
31-
32-
You can configure Git to automatically add sign-offs to all your commits:
20+
For automatic sign-offs on all commits:
3321

3422
```sh
3523
git config --global commit.signoff true
3624
```
3725

38-
Alternatively, you can create a Git alias for creating signed-off commits:
39-
40-
```sh
41-
git config --global alias.cs 'commit -s'
42-
```
43-
44-
Then use `git cs` instead of `git commit` to create commits with sign-offs.
45-
46-
## GPG Signing Your Commits
47-
48-
In addition to DCO sign-offs, all commits must be GPG signed to verify your identity.
49-
50-
### Setting Up GPG
51-
52-
1. If you don't have a GPG key, generate one:
53-
54-
```sh
55-
gpg --full-generate-key
56-
```
57-
58-
Choose RSA and RSA, 4096 bits, and an expiration date of your preference.
59-
60-
2. List your keys to get the ID:
61-
62-
```sh
63-
gpg --list-secret-keys --keyid-format=long
64-
```
65-
66-
Look for the line starting with "sec" and note the key ID after the "/".
67-
68-
3. Configure Git to use your GPG key:
69-
70-
```sh
71-
git config --global user.signingkey YOUR_KEY_ID
72-
```
73-
74-
Replace YOUR_KEY_ID with your actual GPG key ID.
75-
76-
4. Configure Git to sign commits automatically:
77-
78-
```sh
79-
git config --global commit.gpgsign true
80-
```
26+
## GPG Signing
8127

82-
### Creating GPG Signed Commits
28+
For detailed instructions on setting up GPG signing, see [GitHub's documentation on signing commits](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits).
8329

84-
With automatic signing enabled, normal commit commands will create signed commits. You can also explicitly sign with:
30+
To enable automatic GPG signing:
8531

8632
```sh
87-
git commit -S -m "Your commit message"
33+
git config --global user.signingkey YOUR_KEY_ID
34+
git config --global commit.gpgsign true
8835
```
8936

90-
To create a commit with both GPG signature and DCO sign-off:
37+
## Both Signatures Together
38+
39+
To create a commit with both DCO sign-off and GPG signature:
9140

9241
```sh
9342
git commit -S -s -m "Your commit message"
9443
```
9544

96-
### Adding Your GPG Key to GitHub
97-
98-
1. Export your public key:
99-
100-
```sh
101-
gpg --armor --export YOUR_KEY_ID
102-
```
103-
104-
2. Copy the output and add it to your GitHub account under Settings > SSH and GPG keys.
105-
106-
## Adding Both Signatures to Existing Commits
107-
108-
If you forgot to sign your commits, you can fix them:
45+
## Fixing Missing Signatures
10946

110-
### For the Last Commit
47+
To add both signatures to your last commit:
11148

11249
```sh
11350
git commit --amend --no-edit -S -s
11451
```
11552

116-
### For Multiple Commits
117-
118-
For adding both DCO sign-offs and GPG signatures to a range of commits, use interactive rebase:
119-
120-
1. Start the rebase:
121-
122-
```sh
123-
git rebase -i HEAD~n
124-
```
125-
126-
Replace `n` with the number of commits you want to sign.
127-
128-
2. In the editor, change `pick` to `edit` for each commit.
129-
130-
3. For each commit that opens during the rebase:
131-
132-
```sh
133-
git commit --amend --no-edit -S -s
134-
git rebase --continue
135-
```
136-
137-
Alternatively, for adding just DCO sign-offs to multiple commits:
53+
For multiple commits, use:
13854

13955
```sh
140-
git rebase --signoff HEAD~n
56+
git rebase --signoff HEAD~n # Adds DCO sign-offs
14157
```
14258

143-
## Verification
144-
145-
The project uses automated checks to verify that all commits include both the required DCO sign-off and GPG signature. If you receive a signature verification failure notification, please follow the instructions above to add the required signatures.
146-
147-
## Troubleshooting
148-
149-
### GPG Signing Issues
150-
151-
If you encounter issues with GPG signing:
152-
153-
- Ensure your GPG key is properly generated and configured with Git
154-
- Set the `GPG_TTY` environment variable: `export GPG_TTY=$(tty)`
155-
- For Git GUI tools, you may need to configure GPG agent
156-
- On Windows, you might need to specify the full path to gpg.exe
157-
158-
### DCO Sign-off Issues
159-
160-
If you encounter issues with DCO sign-offs:
161-
162-
- Ensure your Git user name and email are correctly configured
163-
- Check that the commit author email matches your configured email
164-
- For commits created through GitHub's web interface, you'll need to add the sign-off manually in the commit message
59+
Then manually add GPG signatures as needed during an interactive rebase.

src/hyperlight_common/src/outb.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2024 The Hyperlight Authors.
2+
Copyright 2025 The Hyperlight Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

src/hyperlight_guest/src/exceptions/idtr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2024 The Hyperlight Authors.
2+
Copyright 2025 The Hyperlight Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

src/hyperlight_guest_capi/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2024 The Hyperlight Authors.
2+
Copyright 2025 The Hyperlight Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

src/hyperlight_guest_capi/src/dispatch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2024 The Hyperlight Authors.
2+
Copyright 2025 The Hyperlight Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

src/hyperlight_guest_capi/src/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2024 The Hyperlight Authors.
2+
Copyright 2025 The Hyperlight Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)