Skip to content

Commit d834902

Browse files
authored
Merge pull request #1 from c-git/develop
0.6.0
2 parents 561e1c0 + 2068186 commit d834902

28 files changed

Lines changed: 1856 additions & 550 deletions

.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
DATABASE_URL="postgres://db_user:password@localhost:5432/bazooka_bot"
2+
SQLX_OFFLINE=true

.github/workflows/general.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ concurrency:
77
on:
88
push:
99
branches:
10-
- main
1110
- develop
11+
workflow_call:
1212

1313
env:
1414
CARGO_TERM_COLOR: always

.github/workflows/release.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ concurrency:
55
cancel-in-progress: true
66

77
on:
8-
push:
9-
branches:
10-
- main
118
pull_request:
129
branches:
1310
- main

.github/workflows/shuttle.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Shuttle Deploy
2+
3+
concurrency:
4+
group: ${{ github.workflow }}-${{ github.ref }}-shuttle-deploy
5+
cancel-in-progress: true
6+
7+
on:
8+
push:
9+
branches:
10+
- main
11+
12+
13+
env:
14+
CARGO_TERM_COLOR: always
15+
16+
jobs:
17+
# https://docs.github.com/en/actions/sharing-automations/reusing-workflows#calling-a-reusable-workflow
18+
run_tests:
19+
uses: ./.github/workflows/general.yml
20+
deploy:
21+
runs-on: ubuntu-latest
22+
needs: run_tests
23+
steps:
24+
- uses: shuttle-hq/deploy-action@v2
25+
with:
26+
shuttle-api-key: ${{ secrets.SHUTTLE_API_KEY }}
27+
project-id: proj_01JHHNVETW1ZV6SKYDYKDX046T

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/target
22
.shuttle-storage
33
Secrets*.toml
4+
.shuttle*

.sqlx/query-e90e3ce260832f87b0bb551979a0fc9113d034f4b7cb785e33576d3cbef0e01e.json

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

.sqlx/query-f79d485f20e22f0b3abf69d0f8bdf6e566cd81c6270a1d51988c19a4b205bdc7.json

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

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
"bbur",
44
"disp",
55
"GLHF",
6+
"isready",
7+
"JHHNVETW",
8+
"SKYDYKDX",
69
"timespan",
710
"zeroize"
811
],

0 commit comments

Comments
 (0)