Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}

- name: Build
run: nix-shell --run "xpg -v ${{ matrix.pg-version }} build"
run: nix-shell --argstr pgVersion "${{ matrix.pg-version }}" --arg cassert false --run "xpg -v ${{ matrix.pg-version }} build"

- name: Run tests
run: nix-shell --run "xpg -v ${{ matrix.pg-version }} test"
run: nix-shell --argstr pgVersion "${{ matrix.pg-version }}" --arg cassert false --run "xpg -v ${{ matrix.pg-version }} test"

test-on-macos:
runs-on: macos-15
Expand All @@ -50,10 +50,10 @@ jobs:
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}

- name: Build
run: nix-shell --run "xpg -v ${{ matrix.pg-version }} build"
run: nix-shell --argstr pgVersion "${{ matrix.pg-version }}" --arg cassert false --run "xpg -v ${{ matrix.pg-version }} build"

- name: Run tests
run: nix-shell --run "xpg -v ${{ matrix.pg-version }} test"
run: nix-shell --argstr pgVersion "${{ matrix.pg-version }}" --arg cassert false --run "xpg -v ${{ matrix.pg-version }} test"

loadtest:
runs-on: ubuntu-latest
Expand All @@ -78,11 +78,11 @@ jobs:
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}

- name: Build
run: nix-shell --run "xpg build"
run: nix-shell --argstr pgVersion "17" --arg cassert false --run "xpg build"

- name: Run load test
run: |
nix-shell --run "net-loadtest ${{ matrix.params.reqs }} ${{ matrix.params.batch }}" >> "$GITHUB_STEP_SUMMARY"
nix-shell --argstr pgVersion "17" --arg cassert false --run "net-loadtest ${{ matrix.params.reqs }} ${{ matrix.params.batch }}" >> "$GITHUB_STEP_SUMMARY"

coverage:
runs-on: ubuntu-latest
Expand All @@ -104,7 +104,7 @@ jobs:
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}

- name: Coverage
run: nix-shell --run "xpg -v ${{ matrix.pg-version }} coverage"
run: nix-shell --argstr pgVersion "${{ matrix.pg-version }}" --arg cassert false --run "xpg -v ${{ matrix.pg-version }} coverage"

- name: Send coverage to Coveralls
uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2.3.6
Expand Down
8 changes: 4 additions & 4 deletions flake.lock

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

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# 2025-11-13
nixpkgs.url = "github:NixOS/nixpkgs/91c9a64ce2a84e648d0cf9671274bb9c2fb9ba60";
xpg = {
url = "github:steve-chavez/xpg/v2.4.0";
url = "github:steve-chavez/xpg/v2.5.0";
};
};

Expand Down
4 changes: 3 additions & 1 deletion shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ in
inherit (xpgLock) owner repo rev;
sha256 = xpgLock.narHash;
})
, pgVersion ? null
, cassert ? true
}:
let
nginxCustom = pkgs.callPackage ./nix/nginxCustom.nix {};
Expand All @@ -36,7 +38,7 @@ in
pkgs.mkShell {
buildInputs =
[
xpgPkgs.xpg
(if pgVersion == null then xpgPkgs.xpg else xpgPkgs.xpg.forVersions { versions = [ pgVersion ]; inherit cassert; })
pythonDeps
nginxCustom.nginxScript
pkgs.curlWithGnuTls
Expand Down
Loading