Skip to content

Commit

Permalink
Merge pull request #1 from c-git/develop
Browse files Browse the repository at this point in the history
0.6.0
  • Loading branch information
c-git authored Jan 14, 2025
2 parents 561e1c0 + 2068186 commit d834902
Show file tree
Hide file tree
Showing 28 changed files with 1,856 additions and 550 deletions.
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
DATABASE_URL="postgres://db_user:password@localhost:5432/bazooka_bot"
SQLX_OFFLINE=true
2 changes: 1 addition & 1 deletion .github/workflows/general.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ concurrency:
on:
push:
branches:
- main
- develop
workflow_call:

env:
CARGO_TERM_COLOR: always
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ concurrency:
cancel-in-progress: true

on:
push:
branches:
- main
pull_request:
branches:
- main
Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/shuttle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Shuttle Deploy

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-shuttle-deploy
cancel-in-progress: true

on:
push:
branches:
- main


env:
CARGO_TERM_COLOR: always

jobs:
# https://docs.github.com/en/actions/sharing-automations/reusing-workflows#calling-a-reusable-workflow
run_tests:
uses: ./.github/workflows/general.yml
deploy:
runs-on: ubuntu-latest
needs: run_tests
steps:
- uses: shuttle-hq/deploy-action@v2
with:
shuttle-api-key: ${{ secrets.SHUTTLE_API_KEY }}
project-id: proj_01JHHNVETW1ZV6SKYDYKDX046T
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/target
.shuttle-storage
Secrets*.toml
.shuttle*

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

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

3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
"bbur",
"disp",
"GLHF",
"isready",
"JHHNVETW",
"SKYDYKDX",
"timespan",
"zeroize"
],
Expand Down
Loading

0 comments on commit d834902

Please sign in to comment.