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
9 changes: 6 additions & 3 deletions .ci/dagger.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"name": "Ci",
"engineVersion": "v0.19.0",
"sdk": "python",
"source": "dagger"
"engineVersion": "v0.19.10",
"sdk": {
"source": "python"
},
"source": "dagger",
"disableDefaultFunctionCaching": true
}
1 change: 1 addition & 0 deletions .ci/dagger/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/sdk
/.venv
/**/__pycache__
/.env
4 changes: 2 additions & 2 deletions .ci/dagger/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[project]
name = "ci"
version = "0.1.0"
requires-python = ">=3.12"
requires-python = ">=3.14"
dependencies = ["dagger-io"]

[tool.uv.sources]
dagger-io = { path = "sdk", editable = true }

[build-system]
requires = ["hatchling==1.25.0"]
requires = ["hatchling==1.28.0"]
build-backend = "hatchling.build"
593 changes: 305 additions & 288 deletions .ci/dagger/uv.lock

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion .flox/.gitattributes

This file was deleted.

5 changes: 0 additions & 5 deletions .flox/.gitignore

This file was deleted.

70 changes: 0 additions & 70 deletions .flox/build/zshrc

This file was deleted.

4 changes: 0 additions & 4 deletions .flox/env.json

This file was deleted.

64 changes: 0 additions & 64 deletions .flox/env/manifest.toml

This file was deleted.

3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
/zig-out
/.zig-cache
/out
/.ansible
/.ansible
flake.lock
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,10 @@ mise dagger_windows
```sh
curl https://mise.run | sh
mise dagger_windows
```

- Minimal Linux Build (Nix)
```sh
sh <(curl --proto '=https' --tlsv1.2 -L https://nixos.org/nix/install) --daemon
nix run .#build-windows-safe
```
1 change: 0 additions & 1 deletion command.txt

This file was deleted.

79 changes: 79 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{
description = "A development shell for Zig";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
};
outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ] (system:
let
pkgs = import nixpkgs { inherit system; };
libraries = with pkgs; [
gtk3
glib
dbus
];
packages = with pkgs; [
pkg-config
dbus
glib
gtk3
];
in
{
packages = {
test = pkgs.writeShellScriptBin "zig-test" ''
zig test src/root.zig
'';

build = pkgs.writeShellScriptBin "zig-build" ''
zig build -Doptimize=ReleaseFast
'';

safe = pkgs.writeShellScriptBin "zig-safe" ''
zig build -Doptimize=ReleaseSafe
'';

build-windows = pkgs.writeShellScriptBin "zig-build-windows" ''
zig build -Dtarget=x86_64-windows -Doptimize=ReleaseFast
'';

build-windows-safe = pkgs.writeShellScriptBin "zig-build-windows-safe" ''
zig build -Dtarget=x86_64-windows -Doptimize=ReleaseSafe
'';

clean = pkgs.writeShellScriptBin "clean" ''
rm -rf flake.lock zig-out .zig-cache out
'';
};

devShells.default = pkgs.mkShell {
buildInputs = packages ++ [
self.packages.${system}.test
self.packages.${system}.build
self.packages.${system}.safe
self.packages.${system}.build-windows
self.packages.${system}.build-windows-safe
self.packages.${system}.clean
];
nativeBuildInputs = with pkgs; [
zig
docker
python314
uv
];
shellHook = ''
export LD_LIBRARY_PATH=${pkgs.lib.makeLibraryPath libraries}:$LD_LIBRARY_PATH
echo "Flexapp Development Environment"
echo ""
echo "Available commands:"
echo " nix run .#test - Run Zig tests (zig-test)"
echo " nix run .#build - Build with ReleaseFast (zig-build)"
echo " nix run .#safe - Build with ReleaseSafe (zig-safe)"
echo " nix run .#build-windows - Build for Windows (ReleaseFast) (zig-build-windows)"
echo " nix run .#build-windows-safe - Build for Windows (ReleaseSafe) (zig-build-windows-safe)"
echo " nix run .#clean - Clean Directory (clean)"
'';
};
});
}
16 changes: 1 addition & 15 deletions mise.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ unix_default_inline_shell_args = "bash -uc"
windows_default_file_shell_args = "pwsh -c"

[tools]
dagger = '0.19.7'
dagger = '0.19.11'
docker-cli = 'latest'
python = "latest"
uv = 'latest'
Expand Down Expand Up @@ -84,20 +84,6 @@ cd .ci && dagger call linux --src=../ export --path={{ output_path }}
{% endif %}
"""

[tasks."flox"]
run = """
{% set sudo = "" %}{% if os_family() != "windows" %}{% set sudo = "sudo " %}{% endif %}
{{ sudo }} docker run --pull always -v {{cwd}}:/flexapp-v {{cwd}}/.flox/build/zshrc:/root/.zshrc -v /var/run/docker.sock:/var/run/docker.sock --name=flox -d -it ghcr.io/flox/flox || echo "Container Exists"
{{ sudo }} docker start flox || echo "Container is already started..."
@{{ sudo }} docker exec -it -w /hd_stack flox flox activate
"""

[tasks."flox_delete"]
run = """
{% set sudo = "" %}{% if os_family() != "windows" %}{% set sudo = "sudo " %}{% endif %}
{{ sudo }} docker rm -f flox
"""

[tasks."code_server"]
run = """
{% set sudo = "" %}{% if os_family() != "windows" %}{% set sudo = "sudo " %}{% endif %}
Expand Down
7 changes: 6 additions & 1 deletion todo.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,9 @@
- VSCode
- https://code.visualstudio.com/sha/download?build=stable&os=win32-x64
- PuTTY
- https://the.earth.li/~sgtatham/putty/latest/w64/putty-64bit-0.83-installer.msi
- https://the.earth.li/~sgtatham/putty/latest/w64/putty-64bit-0.83-installer.msi

# Command
```pwsh
& 'c:\program files (x86)\Liquidware Labs\FlexApp Packaging Automation\fpa-packager.exe' package /Name "avd-rdp-1.25.5623" /PackageVersion 1.25.5623.0 /Path "c:\temp\output" /Installer "C:\temp\new_apps\RemoteDesktop_1.2.5623.0_x64.msi" /NoSystemRestore
```