Skip to content

Commit 4fe70f2

Browse files
authored
Merge branch 'main' into update_flake_lock_test
2 parents 017468e + 8d3ca8c commit 4fe70f2

File tree

5 files changed

+33
-44
lines changed

5 files changed

+33
-44
lines changed

.github/workflows/ci.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,5 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v4
1818

19-
- name: "Cachix: Configure"
20-
uses: cachix/cachix-action@v14
21-
with:
22-
name: services-flake
23-
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
24-
skipPush: true
25-
2619
- name: Build all flake outputs
2720
run: om ci run --extra-access-tokens "github.com=${{ secrets.GITHUB_TOKEN }}" --systems "${{ matrix.system }}"
28-
29-
- name: "Cachix: Push"
30-
if: github.ref == 'refs/heads/main'
31-
run: nix --option system "${{ matrix.system }}" run ./dev#cachix-push

example/share-services/northwind/flake.lock

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

example/share-services/pgweb/flake.lock

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

example/simple/flake.lock

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

nix/services/minio.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ let
1212
export MINIO_DATA_DIR="${MINIO_DATA_DIR}"
1313
export MINIO_CONFIG_DIR="${MINIO_CONFIG_DIR}"
1414
mkdir -p "$MINIO_DATA_DIR" "$MINIO_CONFIG_DIR"
15-
for bucket in ${lib.escapeShellArgs config.buckets}; do
16-
mkdir -p "$MINIO_DATA_DIR/$bucket"
17-
done
15+
${lib.concatMapStringsSep "\n" (bucket: ''
16+
mkdir -p "$MINIO_DATA_DIR/${lib.escapeShellArg bucket}"
17+
'') config.buckets}
1818
'';
1919
};
2020

0 commit comments

Comments
 (0)