Skip to content

Commit

Permalink
✨ Minor CI & Code Improvements (#10)
Browse files Browse the repository at this point in the history
  • Loading branch information
fdnt7 authored Jun 28, 2023
1 parent 83f0cec commit f254ee6
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 52 deletions.
38 changes: 19 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: CI

on:
push:
branches: [ "main" ]
branches: ["main"]
pull_request:
branches: [ "main" ]
branches: ["main"]

env:
CARGO_TERM_COLOR: always
Expand All @@ -31,23 +31,23 @@ jobs:
- 5432:5432

steps:
- name: Checkout Code
uses: actions/checkout@v3
- name: Codespell
uses: codespell-project/actions-codespell@v1
with:
- name: Checkout Code
uses: actions/checkout@v3

- name: Codespell
uses: codespell-project/actions-codespell@v1
with:
path: lyra
ignore_words_list: crate,ans,cant

- name: Setup Database
working-directory: db
run: |
cargo install sqlx-cli --no-default-features --features native-tls,postgres
cargo sqlx database setup
- name: Build And Test
working-directory: lyra
run: |
cargo build --verbose
cargo test --verbose
- name: Setup Database
working-directory: db
run: |
cargo install sqlx-cli --no-default-features --features native-tls,postgres
cargo sqlx database setup
- name: Build And Test
working-directory: lyra
run: |
cargo build --verbose --release
cargo test --verbose --release
50 changes: 22 additions & 28 deletions lyra/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions lyra/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lyra"
version = "0.2.0"
version = "0.2.1"
edition = "2021"
license = "GPL-3.0"
repository = "https://github.com/lyra-music/lyra"
Expand All @@ -17,7 +17,7 @@ atomic-option = "0.1.2"
dashmap = "5.4.0"
version_check = "0.9.4"
os_info = "3.7.0"
dotenv = "0.15.0"
dotenvy = "0.15.7"
hex = "0.4.3"
anyhow = "1.0.71"
thiserror = "1.0.40"
Expand Down Expand Up @@ -67,3 +67,6 @@ default-features = false
version = "0.6.1"
features = ["std"]
default-features = false

[profile.dev.package.sqlx-macros]
opt-level = 3
1 change: 0 additions & 1 deletion lyra/src/bot/modules/config/access/clear.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ impl LyraCommand for Clear {
});
});

// TODO: warn for destructive command
let text_input = TextInput {
custom_id: "destructive-command-confirmation-text-input".into(),
label: "Are you sure?".into(),
Expand Down
1 change: 0 additions & 1 deletion lyra/src/bot/modules/config/access/edit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ pub struct EditMemberRole {
#[async_trait]
impl LyraCommand for EditMemberRole {
async fn execute(self, ctx: Context<App>) -> Result<()> {
// FIXME: Update this when twilight-interactions support user/role differentiation 1st-party
let inputted_mentionables = [
Some(self.member_or_role),
self.member_or_role_2,
Expand Down
2 changes: 1 addition & 1 deletion lyra/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ mod bot;

#[tokio::main]
async fn main() {
dotenv::dotenv().ok();
dotenvy::dotenv().ok();
if let Err(why) = bot::run().await {
tracing::error!("unhandled error: {why:#?}")
}
Expand Down

0 comments on commit f254ee6

Please sign in to comment.