Skip to content

Commit

Permalink
chore: fix CI (#414)
Browse files Browse the repository at this point in the history
* chore(devcontainer): remove rust-toolchain.toml

* fix(flake): server package
  • Loading branch information
uonr authored Apr 29, 2024
1 parent cc5cf59 commit b780e6d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile.prebuild
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ ENV TMPDIR=/home/dev/.tmp
RUN curl -L https://nixos.org/nix/install | sh -s -- --no-daemon;
ENV PATH="/home/dev/.nix-profile/bin:${PATH}"

COPY --chown=dev:dev flake.lock flake.nix rust-toolchain.toml ./
RUN nix develop --command bash -c "true" && rm flake.lock flake.nix rust-toolchain.toml
COPY --chown=dev:dev flake.lock flake.nix ./
RUN nix develop --command bash -c "true" && rm flake.lock flake.nix
1 change: 0 additions & 1 deletion .github/workflows/check-nix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
- 'flake.nix'
- 'Cargo.lock'
- 'Cargo.toml'
- 'rust-toolchain.toml'
- 'package-lock.json'
- '.github/workflows/check-nix.yaml'

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/dev-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:
- '.github/workflows/dev-image.yaml'
- 'flake.nix'
- 'flake.lock'
- 'rust-toolchain.toml'
jobs:
docker:
runs-on: ubuntu-latest
Expand Down
3 changes: 2 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@
src =
let
filters = [
(path: _type: lib.hasInfix "/.sqlx/" path)
(path: _type: lib.hasInfix "/apps/server/sql/" path)
(path: _type: lib.hasInfix "/apps/server/src/" path)
craneLib.filterCargoSources
(path: _type: lib.hasSuffix "/apps/server/schema.sql" path)
Expand Down Expand Up @@ -128,7 +130,6 @@
// {
pname = "server";

doCheck = false;
inherit cargoArtifacts version;
cargoExtraArgs = "--package=server";
}
Expand Down

0 comments on commit b780e6d

Please sign in to comment.