Skip to content

Commit d2b9422

Browse files
committed
feat: move to rke2
1 parent 4197b71 commit d2b9422

File tree

18 files changed

+300
-186
lines changed

18 files changed

+300
-186
lines changed

.github/workflows/release-nixos.yml

+11-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
tags:
55
- nixos-stable
6+
- nixos-testing
67
paths:
78
- 'nixos/**.nix'
89
- 'nixos-options/**.nix'
@@ -37,14 +38,20 @@ jobs:
3738
restore-prefixes-first-match: nix-${{ runner.os }}-
3839
gc-max-store-size-linux: 1073741824
3940

40-
- name: Build
41-
id: build
42-
run: nix build .#nixosConfigurations.contabo-qcow
41+
- name: Build production image
42+
id: build-stable
43+
if: github.ref == 'refs/tags/nixos-stable'
44+
run: nix build .#nixosConfigurations.initial.config.formats.qcow
4345

46+
- name: Build testing image
47+
id: build-testing
48+
if: github.ref == 'refs/tags/nixos-testing'
49+
run: nix build .#nixosConfigurations.initial-contabo.config.formats.qcow
50+
4451
- name: Release
4552
uses: softprops/action-gh-release@v1
4653
with:
47-
tag_name: nixos-stable
54+
tag_name: ${{ github.ref_name }}
4855
token: "${{ secrets.GITHUB_TOKEN }}"
4956
generate_release_notes: true
5057
files: |

Makefile

+11-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ SHELL:=/usr/bin/env bash
22
MAKEFLAGS += --no-builtin-rules --no-builtin-variables
33
TF_CMD:=apply -auto-approve
44
VARIANT=builder
5+
SYSTEM?=aarch64-linux
56

67
#### Nix
78

@@ -12,14 +13,20 @@ ifeq ($(shell uname -s),Darwin)
1213
BUILDER_EXEC:=NIX_CONF_DIR=$(PWD)/bootstrap nix develop .\#builder --command
1314
endif
1415

15-
bootstrap:
16+
bootstrap-aarch64-linux:
1617
@$(BUILDER_EXEC) echo "Started default build environment"
1718

18-
bootstrap-x86:
19+
bootstrap-x86_64-linux:
1920
@VARIANT=builder-x86 $(BUILDER_EXEC) echo "Started x86 environment"
21+
@echo "Waiting builder to"
22+
@sleep 15
2023

21-
nixos-local:
22-
@$(BUILDER_EXEC) nix build .#nixosConfigurations.default --system aarch64-linux
24+
bootstrap: bootstrap-$(SYSTEM)
25+
26+
nixos-local: bootstrap build
27+
28+
build:
29+
@nix build .#nixosConfigurations.default --system $(SYSTEM)
2330

2431
TERRAGRUNT_FILES:=$(shell find terragrunt -type d -name '.*' -prune -o -name 'terragrunt.hcl' -exec dirname {} \;)
2532

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Build an image between available nixos configuration `contabo` and `qcow2` :
3737
> Supported systems are `aarch64-linux`, `x86_64-linux`, `aarch64-darwin` and `x86_64-darwin`.
3838
3939
```bash
40-
nix build .#nixosConfigurations.default --system aarch64-linux
40+
nix build .#nixosConfigurations.default --system x86_64-linux
4141
```
4242

4343
### Uninstall on Darwin:

flake.lock

+68-47
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)