Skip to content

Commit

Permalink
Merge branch 'master' into guillaume/ci/adapt-publish-server-docker-i…
Browse files Browse the repository at this point in the history
…mage
  • Loading branch information
GuillaumeDecMeetsMore committed Jul 16, 2024
2 parents 66e4e76 + 2bb4b08 commit 3e4d0d9
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 14 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Run migrations
run: |
cd scheduler
cargo install sqlx-cli --no-default-features --features postgres || true
(cd crates/infra && sqlx migrate run)
# - name: Run migrations
# run: |
# cd scheduler
# cargo install sqlx-cli --no-default-features --features postgres || true
# (cd crates/infra && sqlx migrate run)

- name: Build and push
uses: docker/build-push-action@v6
Expand Down
22 changes: 13 additions & 9 deletions .github/workflows/server-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
os: [ubuntu-20.04, ubuntu-18.04]
os: [ubuntu-22.04]

services:
postgres:
Expand All @@ -29,9 +29,9 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- uses: actions/cache@v2
- uses: actions/cache@v4
with:
path: |
~/.cargo/bin/
Expand Down Expand Up @@ -63,13 +63,17 @@ jobs:
- name: Clippy
run: |
cd scheduler
cargo clippy --all -- --deny "warnings"
cargo clippy --all
# To re-enable
# cargo clippy --all -- --deny "warnings"
- name: Unused dependencies
run: |
cd scheduler
cargo install cargo-udeps --locked
cargo +nightly udeps --all-targets
# Commented out for now as it's pretty slow in the CI
# TODO: find a solution (e.g. by using caching) or re-enable only on master
# - name: Unused dependencies
# run: |
# cd scheduler
# cargo install cargo-udeps --locked
# cargo +nightly udeps --all-targets

# - name: Outdated dependencies
# run: |
Expand Down
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"rust-analyzer.check.command": "clippy"
}

0 comments on commit 3e4d0d9

Please sign in to comment.