From 2a86ffb94bc3717a441325afeb5ee5262fece805 Mon Sep 17 00:00:00 2001 From: Matthew Stobbs Date: Fri, 28 Feb 2025 21:08:35 -0700 Subject: [PATCH] continuing work on hyprland build --- tasks/config/hyprcursor.yml | 13 +-- tasks/config/hyprgraphics.yml | 8 ++ tasks/config/hyprland.yml | 8 ++ tasks/config/hyprlang.yml | 2 +- tasks/config/hyprwayland_scanner.yml | 2 + tasks/pkgs/_default.yml | 6 -- tasks/pkgs/aquamarine.yml | 2 +- tasks/pkgs/hyprland.yml | 13 +++ tasks/pkgs/hyprlang.yml | 2 +- tests/cleanup.sh | 8 +- tests/setup.sh | 2 + tests/test.sh | 14 ++-- tests/test.yml | 12 +++ tests/test_not_local.yml | 113 --------------------------- vars/main.yml | 1 + vars/pkgs/aquamarine.yml | 2 +- vars/pkgs/hyprcursor.yml | 2 +- vars/pkgs/hyprgraphics.yml | 6 ++ vars/pkgs/hyprland.yml | 2 +- vars/pkgs/hyprlang.yml | 2 +- vars/pkgs/hyprutils.yml | 2 +- vars/pkgs/hyprwayland_scanner.yml | 2 +- 22 files changed, 79 insertions(+), 145 deletions(-) create mode 100644 tasks/config/hyprgraphics.yml create mode 100644 tasks/config/hyprland.yml delete mode 100644 tasks/pkgs/_default.yml create mode 100644 tasks/pkgs/hyprland.yml create mode 100644 tests/test.yml delete mode 100644 tests/test_not_local.yml create mode 100644 vars/pkgs/hyprgraphics.yml diff --git a/tasks/config/hyprcursor.yml b/tasks/config/hyprcursor.yml index 3dd8138..5968c4a 100644 --- a/tasks/config/hyprcursor.yml +++ b/tasks/config/hyprcursor.yml @@ -1,8 +1,9 @@ - name: Set hyprcursor config ansible.builtin.set_fact: - vers: "{{ pkgconfig.hyprcursor.version }}" - repo: "{{ pkgconfig.hyprcursor.repo }}" - pkg_deps: "{{ pkgconfig.hyprcursor.pkg_deps }}" - build_deps: "{{ pkgconfig.hyprcursor.build_deps[ansible_os_family] }}" - installed_files: "{{ pkgconfig.hyprcursor.build_installed_files }}" - git_path: "{{ d_tempdir.path }}/hyprcursor" + hyprcursor: + vers: "{{ pkgconfig.hyprcursor.version }}" + repo: "{{ pkgconfig.hyprcursor.repo }}" + pkg_deps: "{{ pkgconfig.hyprcursor.pkg_deps }}" + build_deps: "{{ pkgconfig.hyprcursor.build_deps[ansible_os_family] }}" + installed_files: "{{ pkgconfig.hyprcursor.build_installed_files }}" + git_path: "{{ d_tempdir.path }}/hyprcursor" diff --git a/tasks/config/hyprgraphics.yml b/tasks/config/hyprgraphics.yml new file mode 100644 index 0000000..af40b45 --- /dev/null +++ b/tasks/config/hyprgraphics.yml @@ -0,0 +1,8 @@ +- name: Set hyprgraphics config + ansible.builtin.set_fact: + hyprgraphics: + vers: "{{ pkgconfig.hyprgraphics.version }}" + repo: "{{ pkgconfig.hyprgraphics.repo }}" + build_deps: "{{ pkgconfig.hyprgraphics.build_deps[ansible_os_family] }}" + installed_files: "{{ pkgconfig.hyprgraphics.build_installed_files }}" + git_path: "{{ d_tempdir.path }}/hyprgraphics" diff --git a/tasks/config/hyprland.yml b/tasks/config/hyprland.yml new file mode 100644 index 0000000..42f1c96 --- /dev/null +++ b/tasks/config/hyprland.yml @@ -0,0 +1,8 @@ +- name: Set hyprland config + ansible.builtin.set_fact: + hyprland: + vers: "{{ pkgconfig.hyprland.version }}" + repo: "{{ pkgconfig.hyprland.repo }}" + pkg_deps: "{{ pkgconfig.hyprland.pkg_deps }}" + build_deps: "{{ pkgconfig.hyprland.build_deps[ansible_os_family] }}" + installed_files: "{{ pkgconfig.hyprland.build_installed_files }}" diff --git a/tasks/config/hyprlang.yml b/tasks/config/hyprlang.yml index 396f28a..1fbb79d 100644 --- a/tasks/config/hyprlang.yml +++ b/tasks/config/hyprlang.yml @@ -4,6 +4,6 @@ vers: "{{ pkgconfig.hyprlang.version }}" repo: "{{ pkgconfig.hyprlang.repo }}" pkg_deps: "{{ pkgconfig.hyprlang.pkg_deps }}" - build_deps: "{{ pkgconfig.hyrplang.build_deps[ansible_os_family] }}" + build_deps: "{{ pkgconfig.hyprlang.build_deps[ansible_os_family] }}" git_path: "{{ d_tempdir.path }}/hyprlang" installed_files: "{{ pkgconfig.hyprlang.build_installed_files }}" diff --git a/tasks/config/hyprwayland_scanner.yml b/tasks/config/hyprwayland_scanner.yml index 4cb2499..5b96dc5 100644 --- a/tasks/config/hyprwayland_scanner.yml +++ b/tasks/config/hyprwayland_scanner.yml @@ -4,3 +4,5 @@ vers: "{{ pkgconfig.hyprwayland_scanner.version }}" repo: "{{ pkgconfig.hyprwayland_scanner.repo }}" build_deps: "{{ pkgconfig.hyprwayland_scanner.build_deps[ansible_os_family] }}" + git_path: "{{ d_tempdir.path }}/hyprwayland-scanner" + installed_files: "{{ pkgconfig.hyprwayland_scanner.build_installed_files }}" diff --git a/tasks/pkgs/_default.yml b/tasks/pkgs/_default.yml deleted file mode 100644 index 9a9f788..0000000 --- a/tasks/pkgs/_default.yml +++ /dev/null @@ -1,6 +0,0 @@ -# vim: set filetype=yaml.ansible : -# TODO: implement ---- -- name: append to syspkgs - debug: - msg: "NOT IMPLEMENTED YET" diff --git a/tasks/pkgs/aquamarine.yml b/tasks/pkgs/aquamarine.yml index 256a51c..7d01932 100644 --- a/tasks/pkgs/aquamarine.yml +++ b/tasks/pkgs/aquamarine.yml @@ -1,5 +1,5 @@ - name: Ensure pkg_deps are added - loop: aquamarine.pkg_deps + loop: "{{ aquamarine.pkg_deps }}" loop_control: loop_var: pkg_dep vars: diff --git a/tasks/pkgs/hyprland.yml b/tasks/pkgs/hyprland.yml new file mode 100644 index 0000000..e2ad47b --- /dev/null +++ b/tasks/pkgs/hyprland.yml @@ -0,0 +1,13 @@ +- name: Ensure pkg_deps are added + loop: "{{ hyprland.pkg_deps }}" + loop_control: + loop_var: pkg_dep + vars: + pkg: "{{ pkg_dep }}" + ansible.builtin.include_tasks: + file: addpkg.yml + +- name: Append to pkg_src + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + hyprland.build_deps }}" + pkg_src: "{{ pkg_src + ['hyprland'] }}" diff --git a/tasks/pkgs/hyprlang.yml b/tasks/pkgs/hyprlang.yml index 7ce2efe..7ad8531 100644 --- a/tasks/pkgs/hyprlang.yml +++ b/tasks/pkgs/hyprlang.yml @@ -1,5 +1,5 @@ - name: Ensure pkg_deps are added - loop: hyprlang.pkg_deps + loop: "{{ hyprlang.pkg_deps }}" loop_control: loop_var: pkg_dep vars: diff --git a/tests/cleanup.sh b/tests/cleanup.sh index af82ef8..f296948 100755 --- a/tests/cleanup.sh +++ b/tests/cleanup.sh @@ -1,12 +1,16 @@ #!/usr/bin/env zsh +set -x + [[ -f ./lib.sh ]] && source ./lib.sh || exit 1 +ssh-keygen -R "[127.0.0.1]:2222" + for os in ${OSBUILDS[@]} do - if podman container exists ${IMAGE}:${os} + if podman container exists ${CONTAINER}_${os} then - podman stop ${IMAGE}:${os} + podman stop ${CONTAINER}_${os} fi done diff --git a/tests/setup.sh b/tests/setup.sh index 0781961..5449f44 100755 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -1,5 +1,7 @@ #!/usr/bin/env zsh +set -x + [[ -f ./lib.sh ]] && source ./lib.sh || exit 1 if [ "$HOSTOS" = "Darwin" ] diff --git a/tests/test.sh b/tests/test.sh index e72dbf8..e463a05 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -1,17 +1,13 @@ #!/usr/bin/env zsh +set -x + [[ -f ./lib.sh ]] && source ./lib.sh || exit 1 for os in ${OSBUILDS[@]} do - if ! podman container exists ${IMAGE}:${os} - then - podman run --rm -it -d --platform linux/amd64 --name ${IMAGE}:${os} -p 2222:22 packagetest - fi - ansible-playbook test_not_local.yml -i inventory.yml - if [ $? -eq 0 ] - then - podman stop ${IMAGE}:${os} - ssh-keygen -R "[127.0.0.1]:2222" + if ! podman container exists ${CONTAINER}_${os}; then + podman run --rm -it -d --platform linux/amd64 --name ${CONTAINER}_${os} -p 2222:22 ${IMAGE}:${os} fi + ansible-playbook "test.yml" -i inventory.yml done diff --git a/tests/test.yml b/tests/test.yml new file mode 100644 index 0000000..f15442e --- /dev/null +++ b/tests/test.yml @@ -0,0 +1,12 @@ +--- +- hosts: localhost + vars: + testpkgs: + - hyprland + tasks: + - name: Test all packages with use_local=false + ansible.builtin.include_role: + name: ansible_role_package + vars: + use_local: false + packages: "{{ testpkgs }}" diff --git a/tests/test_not_local.yml b/tests/test_not_local.yml deleted file mode 100644 index 8623b8d..0000000 --- a/tests/test_not_local.yml +++ /dev/null @@ -1,113 +0,0 @@ ---- -- hosts: localhost - vars: - testpkgs: - - hyprland - # - air - # - alacritty - # - ansible-language-server - # - ansible-lint - # - ansible - # - bashls - # - bat - # - bitwarden - # - blender - # - broot - # - btop - # - buf - # - bufls - # - carapace - # - cheat - # - checkmake - # - choose - # - clangd - # - cmake - # - cmakelang - # - commitlint-cli - # - commitlint-config-conventional - # - consul - # - cssls - # - curlie - # - dbeaver - # - direnv - # - dockerls - # - dotenv-linter - # - duf - # - dust - # - editorconfig - # - eslint - # - eza - # - fd - # - firefox - # - flatpak - # - fzf - # - ghostty - # - git - # - glow - # - go - # - godot - # - gopls - # - gping - # - heroic - # - htmlls - # - htmx-lsp - # - httpie - # - hugo - # - hyperfine - # - intelephense - # - jinja-lsp - # - jq - # - jsonls - # - kitty - # - lazygit - # - libreoffice - # - lua-language-server - # - markdownlint-cli - # - mcfly - # - neovide - # - neovim - # - nerdfonts - # - nextcloud - # - nginxls - # - nodejs - # - nomad - # - packer - # - pandoc - # - pgadmin - # - pipx - # - podman - # - pyright - # - python3 - # - quobix-vacuum - # - revive - # - ripgrep - # - rust - # - sd - # - sqlfluff - # - sqlls - # - starship - # - stow - # - tailscale - # - tailwindcss-languageserver - # - templ - # - terraform - # - terraformls - # - thunderbird - # - tidy - # - tldr - # - tmux - # - vault - # - xh - # - yamlls - # - zfs - # - zig - # - zls - # - zoxide - # - zsh - tasks: - - name: Test all packages with use_local=false - ansible.builtin.include_role: - name: ansible_role_package - vars: - use_local: false - packages: "{{ testpkgs }}" diff --git a/vars/main.yml b/vars/main.yml index 86ffd38..20bd108 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -27,3 +27,4 @@ defaults: ## Extra config that usually will not need to be changed hyprland_clean: true +hyprgitbase: https://github.com/hyprwm diff --git a/vars/pkgs/aquamarine.yml b/vars/pkgs/aquamarine.yml index b26755e..b0cd496 100644 --- a/vars/pkgs/aquamarine.yml +++ b/vars/pkgs/aquamarine.yml @@ -1,6 +1,6 @@ aquamarine: version: v0.7.2 - repo: https://github.com/hyprwm/aquamarine + repo: "{{ hyprgitbase }}/aquamarine" pkg_deps: - hyprwayland_scanner - hyprutils diff --git a/vars/pkgs/hyprcursor.yml b/vars/pkgs/hyprcursor.yml index 4bcd9e2..916afba 100644 --- a/vars/pkgs/hyprcursor.yml +++ b/vars/pkgs/hyprcursor.yml @@ -1,6 +1,6 @@ hyprcursor: version: - repo: https://github.com/hyprwm/hyprcursor + repo: "{{ hyprgitbase }}/hyprcursor" pkg_deps: - hyprlang build_deps: diff --git a/vars/pkgs/hyprgraphics.yml b/vars/pkgs/hyprgraphics.yml new file mode 100644 index 0000000..9802abb --- /dev/null +++ b/vars/pkgs/hyprgraphics.yml @@ -0,0 +1,6 @@ +hyprgraphics: + version: + repo: "{{ hyprgitbase }}/hyprgraphics" + build_deps: + RedHat: [] + build_installed_files: [] diff --git a/vars/pkgs/hyprland.yml b/vars/pkgs/hyprland.yml index cc81e19..dcf505d 100644 --- a/vars/pkgs/hyprland.yml +++ b/vars/pkgs/hyprland.yml @@ -1,6 +1,6 @@ hyprland: version: v0.47.2 - repo: https://github.com/hyprwm/Hyprland + repo: "{{ hyprgitbase }}/Hyprland" pkg_deps: - hyprwayland_scanner - hyprutils diff --git a/vars/pkgs/hyprlang.yml b/vars/pkgs/hyprlang.yml index 4e2ab13..f3c1483 100644 --- a/vars/pkgs/hyprlang.yml +++ b/vars/pkgs/hyprlang.yml @@ -1,6 +1,6 @@ hyprlang: version: v0.6.0 - repo: https://github.com/hyprwm/hyprlang + repo: "{{ hyprgitbase }}/hyprlang" pkg_deps: [] build_deps: RedHat: [] diff --git a/vars/pkgs/hyprutils.yml b/vars/pkgs/hyprutils.yml index 4e1ea2a..1dfd72f 100644 --- a/vars/pkgs/hyprutils.yml +++ b/vars/pkgs/hyprutils.yml @@ -1,6 +1,6 @@ hyprutils: version: v0.5.1 - repo: https://github.com/hyprwm/hyprutils + repo: "{{ hyprgitbase }}/hyprutils" build_deps: RedHat: - pixman-devel diff --git a/vars/pkgs/hyprwayland_scanner.yml b/vars/pkgs/hyprwayland_scanner.yml index 77d5ea8..7f1366b 100644 --- a/vars/pkgs/hyprwayland_scanner.yml +++ b/vars/pkgs/hyprwayland_scanner.yml @@ -1,6 +1,6 @@ hyprwayland_scanner: version: v0.4.4 - repo: https://github.com/hyprwm/hyprwayland-scanner + repo: "{{ hyprgitbase }}/hyprwayland-scanner" build_deps: RedHat: - pugixml-devel