From 7c9f678c25b698b76ac5f4794ee57ec11c27a1e6 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Tue, 17 Feb 2026 16:49:42 -0800 Subject: [PATCH] repo: gitea: workflows: dfi: update to reflect default paths --- .gitea/workflows/dfi.bash | 14 ++---- .gitea/workflows/dfi.yaml | 96 +++++++++++++++++++-------------------- 2 files changed, 53 insertions(+), 57 deletions(-) diff --git a/.gitea/workflows/dfi.bash b/.gitea/workflows/dfi.bash index 46c479f..e73b40c 100755 --- a/.gitea/workflows/dfi.bash +++ b/.gitea/workflows/dfi.bash @@ -50,15 +50,11 @@ function host::clean() docker system prune -f docker builder prune -af - # Remove default `dfi` layout + # Remove default environment and layout local _paths _paths+=(".bashrc") - _paths+=(".config") _paths+=(".docker") _paths+=("docker-finance") - _paths+=("finance-flow") - _paths+=("plugins") - _paths+=("share.d") for _path in "${_paths[@]}"; do rm -fr "${HOME:?}/${_path:?}" done @@ -78,7 +74,7 @@ function host::clean() function client::install() { - "${HOME:?}"/docker-finance/client/install.bash + "${HOME:?}"/docker-finance/repo/client/install.bash source "${HOME:?}"/.bashrc } @@ -134,7 +130,7 @@ function client::finance::edit() # Build: uncomment all optional packages and plugin dependencies if [[ "$_tag" == "default" ]]; then local _file - _file="${HOME:?}/.config/docker-finance.d/client/$(uname -s)-$(uname -m)/archlinux/default/Dockerfiles/${USER:?}@$(uname -n)" + _file="${HOME:?}/docker-finance/conf.d/client/$(uname -s)-$(uname -m)/archlinux/default/Dockerfiles/${USER:?}@$(uname -n)" [ ! -f "$_file" ] && exit 1 sed -i '18,56s/#//' "$_file" fi @@ -372,7 +368,7 @@ function container::finance::edit() [[ -z "$CI_DFI_FETCH_MOBULA" || -z "$CI_DFI_FETCH_ETHERSCAN" ]] && exit 1 - local -r _file="${HOME}/finance-flow/profiles/testprofile/${USER}/docker-finance.d/fetch/fetch.yaml" + local -r _file="${HOME}/docker-finance/flow/profiles/testprofile/${USER}/conf.d/fetch/fetch.yaml" [ ! -f "$_file" ] && exit 1 # `prices` @@ -625,7 +621,7 @@ function container::finance::times() # NOTE: impl-specific: currently, timewarrior requires confirmation # which cannot be passed here (via "< <(echo yes)"). - local -r _path="${HOME:?}/finance-flow/times/timew" + local -r _path="${HOME:?}/docker-finance/flow/times/timew" mkdir -p "$_path" && touch "${_path}/timewarrior.cfg" # Initial run presents confirmation dialog (so echo "yes") diff --git a/.gitea/workflows/dfi.yaml b/.gitea/workflows/dfi.yaml index c93734e..29152d7 100644 --- a/.gitea/workflows/dfi.yaml +++ b/.gitea/workflows/dfi.yaml @@ -60,7 +60,7 @@ jobs: # toward the runner's actual home rather than the job's temporary cache home - name: Host preparation (workspace) run: | - cp -aR ${{ gitea.workspace }} "${HOME}"/docker-finance + mkdir "${HOME}"/docker-finance && cp -aR ${{ gitea.workspace }} "${HOME}"/docker-finance/repo ## ## Client (host) @@ -68,7 +68,7 @@ jobs: - name: client::install run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::install + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::install ## ## Client (finance) @@ -76,63 +76,63 @@ jobs: - name: client::finance::gen run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::finance::gen + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::finance::gen - name: client::finance::edit run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::finance::edit + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::finance::edit - name: client::finance::build run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::finance::build + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::finance::build - name: client::finance::backup run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::finance::backup + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::finance::backup - name: client::finance::up run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::finance::up + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::finance::up - name: client::finance::stop run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::finance::stop + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::finance::stop - name: client::finance::start run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::finance::start + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::finance::start - name: client::finance::down run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::finance::down + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::finance::down - name: client::finance::shell run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::finance::shell + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::finance::shell - name: client::finance::exec run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::finance::exec + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::finance::exec - name: client::finance::plugins run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::finance::plugins + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::finance::plugins - name: client::finance::run run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::finance::run + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::finance::run - name: client::finance::version run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::finance::version + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::finance::version - name: client::finance::update run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::finance::update + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::finance::update - name: client::finance::rm run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::finance::rm + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::finance::rm ## ## Container (finance) @@ -143,55 +143,55 @@ jobs: CI_DFI_FETCH_MOBULA=${{ secrets.CI_DFI_FETCH_MOBULA }} \ CI_DFI_FETCH_COINGECKO=${{ secrets.CI_DFI_FETCH_COINGECKO }} \ CI_DFI_FETCH_ETHERSCAN=${{ secrets.CI_DFI_FETCH_ETHERSCAN }} \ - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash container::finance::edit + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash container::finance::edit - name: container::finance::fetch run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash container::finance::fetch + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash container::finance::fetch - name: container::finance::import run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash container::finance::import + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash container::finance::import - name: container::finance::hledger run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash container::finance::hledger + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash container::finance::hledger - name: container::finance::hledger-ui run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash container::finance::hledger-ui + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash container::finance::hledger-ui - name: container::finance::hledger-vui run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash container::finance::hledger-vui + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash container::finance::hledger-vui - name: container::finance::hledger-web run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash container::finance::hledger-web + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash container::finance::hledger-web - name: container::finance::meta run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash container::finance::meta + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash container::finance::meta - name: container::finance::reports run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash container::finance::reports + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash container::finance::reports - name: container::finance::taxes run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash container::finance::taxes + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash container::finance::taxes - name: container::finance::times run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash container::finance::times + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash container::finance::times - name: container::finance::plugins run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash container::finance::plugins + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash container::finance::plugins - name: container::finance::root run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash container::finance::root + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash container::finance::root ## ## Client (dev-tools) @@ -199,75 +199,75 @@ jobs: - name: client::dev-tools::gen run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::dev-tools::gen + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::dev-tools::gen - name: client::dev-tools::edit run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::dev-tools::edit + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::dev-tools::edit - name: client::dev-tools::build run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::dev-tools::build + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::dev-tools::build - name: client::dev-tools::backup run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::dev-tools::backup + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::dev-tools::backup - name: client::dev-tools::up run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::dev-tools::up + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::dev-tools::up - name: client::dev-tools::stop run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::dev-tools::stop + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::dev-tools::stop - name: client::dev-tools::start run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::dev-tools::start + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::dev-tools::start - name: client::dev-tools::down run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::dev-tools::down + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::dev-tools::down - name: client::dev-tools::shell run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::dev-tools::shell + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::dev-tools::shell - name: client::dev-tools::exec run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::dev-tools::exec + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::dev-tools::exec - name: client::dev-tools::plugins run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::dev-tools::plugins + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::dev-tools::plugins - name: client::dev-tools::run run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::dev-tools::run + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::dev-tools::run - name: client::dev-tools::version run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::dev-tools::version + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::dev-tools::version - name: client::dev-tools::update run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::dev-tools::update + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::dev-tools::update - name: client::dev-tools::license run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::dev-tools::license + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::dev-tools::license - name: client::dev-tools::linter run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::dev-tools::linter + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::dev-tools::linter - name: client::dev-tools::doxygen run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::dev-tools::doxygen + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::dev-tools::doxygen - name: client::dev-tools::rm run: | - "${HOME}"/docker-finance/.gitea/workflows/dfi.bash client::dev-tools::rm + "${HOME}"/docker-finance/repo/.gitea/workflows/dfi.bash client::dev-tools::rm ## ## Host (act_runner)