Skip to content

Commit 8091a0a

Browse files
authored
Merge pull request #18 from logos-co/flake_update
Update Repos and Flake
2 parents 90a75a4 + 8231a8a commit 8091a0a

30 files changed

+581
-304
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,17 @@ jobs:
3535
3636
- name: Install Nix
3737
if: steps.filter.outputs.skip_build != 'true'
38-
uses: DeterminateSystems/nix-installer-action@main
38+
uses: cachix/install-nix-action@v27
39+
with:
40+
extra_nix_config: |
41+
experimental-features = nix-command flakes
3942
40-
- name: Setup Nix cache
43+
- name: Setup Cachix
4144
if: steps.filter.outputs.skip_build != 'true'
42-
uses: DeterminateSystems/magic-nix-cache-action@main
43-
# For faster CI, consider adding a dedicated binary cache:
44-
# cachix-name: logos-workspace
45-
# cachix-auth-token: ${{ secrets.CACHIX_AUTH_TOKEN }}
45+
uses: cachix/cachix-action@v15
46+
with:
47+
name: logos-co
48+
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
4649

4750
- name: Add workspace tools to PATH
4851
if: steps.filter.outputs.skip_build != 'true'

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,3 +137,6 @@
137137
[submodule "repos/logos-test-modules"]
138138
path = repos/logos-test-modules
139139
url = git@github.com:logos-co/logos-test-modules.git
140+
[submodule "repos/logos-nix"]
141+
path = repos/logos-nix
142+
url = git@github.com:logos-co/logos-nix.git

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ Because the workspace flake declares `logos-liblogos.inputs.logos-cpp-sdk.follow
8989
| `ws worktree add <name> [-b br]` | Create a worktree with submodules and `ws/<branch>` branches |
9090
| `ws worktree list` | List all worktrees |
9191
| `ws worktree remove <name>` | Remove a worktree |
92+
| `ws repo-upgrade [repo...\|--group G]` | Pull latest master/main for submodules |
9293
| `ws sync-graph` | Regenerate `nix/dep-graph.nix` from repo flake.nix files |
9394
| `ws nix-diagnose <repo>` | Detect circular deps and version conflicts in flake.lock |
9495
| `ws check-qt <repo>` | Detect Qt version conflicts in nix closure or module cache |

0 commit comments

Comments
 (0)