Skip to content

Commit b2fcade

Browse files
committed
feat: multiversion timescaledb
1 parent 7ddc794 commit b2fcade

File tree

4 files changed

+22
-62
lines changed

4 files changed

+22
-62
lines changed

.github/workflows/nix-build.yml

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,23 @@ on:
1010

1111
permissions:
1212
id-token: write
13-
# required by dependent workflows
13+
# required by testinfra-ami-build dependent workflows
1414
contents: write
1515
packages: write
1616

1717
jobs:
18-
nix-matrix:
19-
runs-on: ubuntu-latest
20-
outputs:
21-
matrix: ${{ steps.set-matrix.outputs.matrix }}
22-
steps:
23-
- uses: actions/checkout@v4
24-
- uses: cachix/install-nix-action@v30
25-
- id: set-matrix
26-
name: Generate Nix Matrix
27-
run: |
28-
set -Eeu
29-
matrix="$(nix eval --json '.#githubActions.matrix')"
30-
echo "matrix=$matrix" >> "$GITHUB_OUTPUT"
31-
3218
build-run-image:
33-
name: ${{ matrix.name }} (${{ matrix.system }})
34-
needs: nix-matrix
35-
runs-on: ${{ matrix.os }}
3619
strategy:
3720
fail-fast: false
38-
matrix: ${{fromJSON(needs.nix-matrix.outputs.matrix)}}
21+
matrix:
22+
include:
23+
- runner: blacksmith-32vcpu-ubuntu-2404
24+
arch: amd64
25+
- runner: blacksmith-32vcpu-ubuntu-2404-arm
26+
arch: arm64
27+
- runner: macos-latest-xlarge
28+
arch: arm64
29+
runs-on: ${{ matrix.runner }}
3930
timeout-minutes: 180
4031
steps:
4132
- name: Checkout Repo
@@ -113,12 +104,23 @@ jobs:
113104
sudo rm -rf /tmp/* 2>/dev/null || true
114105
echo "=== AFTER CLEANUP ==="
115106
df -h
116-
- run: nix build -L '.#${{ matrix.attr }}'
107+
- name: Build psql bundle
108+
run: >
109+
nix run "github:Mic92/nix-fast-build?rev=b1dae483ab7d4139a6297e02b6de9e5d30e43d48"
110+
-- --skip-cached --no-nom ${{ matrix.runner == 'macos-latest-xlarge' && '--max-jobs 1' || '' }}
111+
--flake ".#checks.$(nix eval --raw --impure --expr 'builtins.currentSystem')"
117112
env:
118113
AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
119114
AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
120115
AWS_SESSION_TOKEN: ${{ env.AWS_SESSION_TOKEN }}
121116

117+
run-testinfra:
118+
needs: build-run-image
119+
if: ${{ success() }}
120+
uses: ./.github/workflows/testinfra-ami-build.yml
121+
secrets:
122+
DEV_AWS_ROLE: ${{ secrets.DEV_AWS_ROLE }}
123+
122124
run-tests:
123125
needs: build-run-image
124126
if: ${{ success() }}

flake.lock

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

flake.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
git-hooks.url = "github:cachix/git-hooks.nix";
1515
git-hooks.inputs.nixpkgs.follows = "nixpkgs";
1616
nixpkgs-go124.url = "github:Nixos/nixpkgs/d2ac4dfa61fba987a84a0a81555da57ae0b9a2b0";
17-
nix-github-actions.url = "github:nix-community/nix-github-actions";
18-
nix-github-actions.inputs.nixpkgs.follows = "nixpkgs";
1917
};
2018

2119
outputs =
@@ -38,7 +36,6 @@
3836
nix/nixpkgs.nix
3937
nix/packages
4038
nix/overlays
41-
nix/github-actions.nix
4239
];
4340
});
4441
}

nix/github-actions.nix

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)