Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into flatpak
Browse files Browse the repository at this point in the history
  • Loading branch information
someone13574 committed Apr 25, 2024
2 parents 199b2a0 + c833a7e commit ab6b7ba
Show file tree
Hide file tree
Showing 234 changed files with 10,112 additions and 5,648 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,11 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v4
with:
# We need to fetch more than one commit so that `script/draft-release-notes`
# is able to diff between the current and previous tag.
#
# 25 was chosen arbitrarily.
fetch-depth: 25
clean: false
submodules: "recursive"

Expand Down Expand Up @@ -206,7 +211,8 @@ jobs:
exit 1
fi
mkdir -p target/
script/draft-release-notes "$version" "$channel" > target/release-notes.md
# Ignore any errors that occur while drafting release notes to not fail the build.
script/draft-release-notes "$version" "$channel" > target/release-notes.md || true
- name: Generate license file
run: script/generate-licenses
Expand Down
4 changes: 3 additions & 1 deletion .zed/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@
"formatter": "prettier"
}
},
"formatter": "auto"
"formatter": "auto",
"remove_trailing_whitespace_on_save": true,
"ensure_final_newline_on_save": true
}
5 changes: 5 additions & 0 deletions .zed/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,10 @@
"label": "clippy",
"command": "cargo",
"args": ["xtask", "clippy"]
},
{
"label": "assistant2",
"command": "cargo",
"args": ["run", "-p", "assistant2", "--example", "assistant_example"]
}
]
Loading

0 comments on commit ab6b7ba

Please sign in to comment.