Skip to content

Commit 91a3361

Browse files
authored
Merge branch 'main' into dependabot/cargo/flatbuffers-25.1.24
2 parents 435ed72 + 1e24b3a commit 91a3361

File tree

23 files changed

+526
-236
lines changed

23 files changed

+526
-236
lines changed

.github/dependabot.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ updates:
44
directory: "/"
55
schedule:
66
interval: "daily"
7+
labels: []
78
- package-ecosystem: "cargo"
89
directories: ["/", "src/tests/rust_guests/simpleguest","src/tests/rust_guests/callbackguest"]
910
schedule:
1011
interval: "daily"
12+
labels:
13+
- "area/dependencies"

.github/workflows/IssueLabelChecker.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,22 @@ jobs:
1414
- uses: actions/checkout@v4
1515
- name: Check and Add label
1616
run: |
17-
LABELS=$(gh issue view ${{ github.event.issue.number }} --json labels -q '.labels[].name')
18-
if [[ $LABELS != *"needs review"* ]]; then
19-
gh issue edit ${{ github.event.issue.number }} --add-label "needs review"
17+
# The cryptic head -c -1 is because otherwise gh always terminates output with a newline
18+
readarray -d $'\0' lifecycles < <(gh issue view ${{ github.event.issue.number }} --json labels -q '[.labels[] | .name | select(startswith("lifecycle/"))] | join("\u0000")' | head -c -1)
19+
if [[ ${#lifecycles[@]} -ne 1 ]]; then
20+
if [[ ${#lifecycles[@]} -ge 1 ]]; then
21+
echo 'Too many lifecycle labels; replacing all with `lifecycle/needs review`'
22+
fi
23+
commands=()
24+
for label in "${lifecycles[@]}"; do
25+
if [[ "$label" != "lifecycle/needs review" ]]; then
26+
echo "Removing label ${label}"
27+
commands+=("--remove-label" "${label}")
28+
fi
29+
done
30+
echo 'Adding `lifecycle/needs review`'
31+
commands+=("--add-label" "lifecycle/needs review")
32+
gh issue edit ${{ github.event.issue.number }} "${commands[@]}"
2033
fi
2134
env:
2235
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/PRLabelChecker.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ jobs:
1414
- uses: actions/checkout@v4
1515
- name: Check for specific labels
1616
run: |
17+
# ignore dependabot PRs
18+
if [[ ${{ github.actor }} == "dependabot[bot]" ]]; then
19+
echo "Ignoring dependabot PRs."
20+
exit 0
21+
fi
1722
# Fetch repository labels from the GitHub API
1823
REPO_LABELS=$(gh api repos/${{ github.repository }}/labels --jq '.[].name')
1924

.github/workflows/ValidatePullRequest.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ jobs:
3232
- '**/*.txt'
3333
all:
3434
- '**/*'
35+
common_deps:
36+
- '**/src/hyperlight_guest/Cargo.toml'
37+
- '**/src/hyperlight_common/Cargo.toml'
3538
- uses: actions/github-script@v7
3639
id: docs-only
3740
with:
@@ -40,6 +43,21 @@ jobs:
4043
let all_file_count = ${{steps.changes.outputs.all_count}};
4144
return all_file_count === docs_file_count;
4245
result-encoding: string
46+
# Check to see if this a dependabot PR and if it updates either the common or guest Cargo.toml files
47+
# if it does we need to try and generate a new Cargo.lock file as the PR validation checks that these are up to date
48+
- name: Update Cargo.lock for dependabot changes
49+
if: ${{ github.actor == 'dependabot[bot]' && steps.changes.outputs.common_deps_count > 0 }}
50+
run: |
51+
cargo update --manifest-path src/tests/rust_guests/simpleguest/Cargo.toml
52+
cargo update --manifest-path src/tests/rust_guests/callbackguest/Cargo.toml
53+
if [ -n "$(git status --porcelain src/tests/rust_guests/simpleguest/Cargo.lock src/tests/rust_guests/callbackguest/Cargo.lock)" ]; then
54+
git config --global user.name "github-actions[bot]"
55+
git config --global user.email "github-actions[bot]@users.noreply.github.com"
56+
git add src/tests/rust_guests/simpleguest/Cargo.lock
57+
git add src/tests/rust_guests/callbackguest/Cargo.lock
58+
git commit -m "Update Cargo.lock files for dependabot changes"
59+
git push
60+
fi
4361
4462
rust:
4563
needs:

Cargo.lock

Lines changed: 86 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,13 @@ Hyperlight.
261261
> Note: For general Hyperlight development, you may also need flatc (Flatbuffer compiler): for instructions,
262262
> see [here](https://github.com/google/flatbuffers).
263263

264+
## Join our Community Meetings
265+
266+
This project holds fortnightly community meetings to discuss the project's progress, roadmap, and any other topics of interest. The meetings are open to everyone, and we encourage you to join us.
267+
268+
- **When**: Every other Wednesday 09:00 (PST/PDT) [Convert to your local time](https://dateful.com/convert/pst-pdt-pacific-time?t=09)
269+
- **Where**: Zoom! - Agenda and information on how to join can be found in the [Hyperlight Community Meeting Notes](https://hackmd.io/blCrncfOSEuqSbRVT9KYkg#Agenda). Please log into hackmd to edit!
270+
264271
## More Information
265272
266273
For more information, please refer to our compilation of documents in the [`docs/` directory](./docs/README.md).

0 commit comments

Comments
 (0)