Skip to content

Commit

Permalink
Merge pull request #21 from perpetualcacophony/main
Browse files Browse the repository at this point in the history
merge changes for v1.8.0
  • Loading branch information
perpetualcacophony committed Jul 14, 2024
2 parents a7a370c + 37b12f6 commit f202b8d
Show file tree
Hide file tree
Showing 75 changed files with 3,317 additions and 1,590 deletions.
17 changes: 14 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ on:
push:
paths-ignore: [ "README.md" ]
branches: [ "main" ]

pull_request:
types: [ opened ]

pull_request:
types: [opened, synchronize, reopened]

env:
CARGO_TERM_COLOR: always

Expand All @@ -18,6 +18,17 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4

# https://www.mongodb.com/docs/manual/tutorial/install-mongodb-on-ubuntu/
- name: Install mongod (test dependency)
run: |
sudo apt-get install gnupg curl
curl -fsSL https://www.mongodb.org/static/pgp/server-7.0.asc | \
sudo gpg -o /usr/share/keyrings/mongodb-server-7.0.gpg \
--dearmor
echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/7.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-7.0.list
sudo apt-get update
sudo apt-get install -y mongodb-org-server
- name: Install rust
uses: dtolnay/rust-toolchain@nightly
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Deploy

on:
release:
types: [ published ]

workflow_dispatch:

jobs:
redeploy:
runs-on: ubuntu-latest

steps:
- name: Trigger webhook
uses: distributhor/workflow-webhook@v3
with:
webhook_url: ${{ secrets.REDEPLOY_WEBHOOK_URL }}
23 changes: 0 additions & 23 deletions .github/workflows/publish.yml

This file was deleted.

8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,10 @@
/*.yaml
!example-compose.yaml

/wordle/
/wordle/

/macros/Cargo.lock
/macros/target/

/slimebot_error/Cargo.lock
/slimebot_error/target/
5 changes: 0 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
{
"rust-analyzer.linkedProjects": [
"./Cargo.toml",
"./Cargo.toml",
"./Cargo.toml",
"./Cargo.toml",
"./Cargo.toml",
"./Cargo.toml"
],
"rust-analyzer.showUnlinkedFileNotification": false,
"rust-analyzer.checkOnSave": true
Expand Down
Loading

0 comments on commit f202b8d

Please sign in to comment.