From 086ba5aa3da821bab3856be665325d426d335c65 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 10:03:49 +0200 Subject: [PATCH 01/34] chore: ansible -> gitea worklow --- .gitea/workflows/add-new-service-ansible.yml | 73 ++++++++++++++++ .gitea/workflows/add-new-service.yml | 37 -------- .gitea/workflows/deploy-service.yml | 63 ++++++++++++++ .gitea/workflows/deploy.yml | 88 +++++++++----------- 4 files changed, 174 insertions(+), 87 deletions(-) create mode 100644 .gitea/workflows/add-new-service-ansible.yml create mode 100644 .gitea/workflows/deploy-service.yml diff --git a/.gitea/workflows/add-new-service-ansible.yml b/.gitea/workflows/add-new-service-ansible.yml new file mode 100644 index 0000000..1471f16 --- /dev/null +++ b/.gitea/workflows/add-new-service-ansible.yml @@ -0,0 +1,73 @@ +name: Add new service + +on: + push: + branches: + - 'feature/add-service-*' + +# TODO: when to deploy to prod? Manual (i.e. cli command)? +jobs: + deploy: + runs-on: hla-dev + + env: + ANSIBLE_CONFIG: "${{ github.workspace }}/ansible/ansible.cfg" + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Install and setup uv + uses: actions/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0 + with: + version: "latest" + enable-cache: true # Speeds up runs by caching python dependencies # TODO: does this work? + + - name: Install Python 3.10 + run: uv python install 3.10 + + - name: Run tests + run: | + cd cli && uv run pytest + + - name: Parse Service Directory Name + id: parse_branch + # Uses bash shell parameter elimination to strip 'feature/add-service-' from the front + run: | + BRANCH="${{ github.ref_name }}" + SERVICE_NAME="${BRANCH#feature/add-service-}" + echo "service_name_lower=$SERVICE_NAME" >> $GITHUB_OUTPUT + + # TODO: look into venv caching (will do later in case we move from uv to pixi) + # - name: Cache Python Virtual Environment + # uses: actions/cache@v4 + # with: + # path: .venv + # # Changes uv.lock will automatically invalidate the cache and rebuild + # key: ${{ runner.os }}-uv-cli-venv-${{ hashFiles('cli/uv.lock') }} + # restore-keys: | + # ${{ runner.os }}-uv-cli-venv- + + # # Only create the venv if the cache didn't restore an existing one + # if [ ! -d ".venv" ]; then + # echo "Building new .venv" + # uv venv .venv + # fi + - name: Initialize Virtual Environment from cli/uv.lock + run: | + uv venv .venv + uv sync --directory cli + + - name: Install Ansible Galaxy Collections + run: | + uv run ansible-galaxy collection install -r ansible/collections/requirements.yml -p ./ansible/installed-collections + + # TODO: dev/prod + - name: Run New Service Playbook + working-directory: ansible + run: | + uv run ansible-playbook playbooks/add-new-service.yml \ + -i "inventories/dev/hosts.yml" \ + --extra-vars="repo_root=${{ github.workspace }}" \ + --extra-vars="service_name_lower=${{ steps.parse_branch.outputs.service_name_lower }}" \ + -v diff --git a/.gitea/workflows/add-new-service.yml b/.gitea/workflows/add-new-service.yml index 1471f16..c32fa0e 100644 --- a/.gitea/workflows/add-new-service.yml +++ b/.gitea/workflows/add-new-service.yml @@ -10,9 +10,6 @@ jobs: deploy: runs-on: hla-dev - env: - ANSIBLE_CONFIG: "${{ github.workspace }}/ansible/ansible.cfg" - steps: - name: Checkout repository uses: actions/checkout@v4 @@ -37,37 +34,3 @@ jobs: BRANCH="${{ github.ref_name }}" SERVICE_NAME="${BRANCH#feature/add-service-}" echo "service_name_lower=$SERVICE_NAME" >> $GITHUB_OUTPUT - - # TODO: look into venv caching (will do later in case we move from uv to pixi) - # - name: Cache Python Virtual Environment - # uses: actions/cache@v4 - # with: - # path: .venv - # # Changes uv.lock will automatically invalidate the cache and rebuild - # key: ${{ runner.os }}-uv-cli-venv-${{ hashFiles('cli/uv.lock') }} - # restore-keys: | - # ${{ runner.os }}-uv-cli-venv- - - # # Only create the venv if the cache didn't restore an existing one - # if [ ! -d ".venv" ]; then - # echo "Building new .venv" - # uv venv .venv - # fi - - name: Initialize Virtual Environment from cli/uv.lock - run: | - uv venv .venv - uv sync --directory cli - - - name: Install Ansible Galaxy Collections - run: | - uv run ansible-galaxy collection install -r ansible/collections/requirements.yml -p ./ansible/installed-collections - - # TODO: dev/prod - - name: Run New Service Playbook - working-directory: ansible - run: | - uv run ansible-playbook playbooks/add-new-service.yml \ - -i "inventories/dev/hosts.yml" \ - --extra-vars="repo_root=${{ github.workspace }}" \ - --extra-vars="service_name_lower=${{ steps.parse_branch.outputs.service_name_lower }}" \ - -v diff --git a/.gitea/workflows/deploy-service.yml b/.gitea/workflows/deploy-service.yml new file mode 100644 index 0000000..39c8ec3 --- /dev/null +++ b/.gitea/workflows/deploy-service.yml @@ -0,0 +1,63 @@ +name: Service Deployer + +on: + workflow_call: + inputs: + service_name: + required: true + type: string + description: "Target service name lower (e.g. master)" + environment: + required: true + type: string + # default: "dev" + description: "Target deployment environment: 'dev' or 'prod'" + +jobs: + deploy: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Resolve service name parameters + id: vars + run: | + SERVICE_NAME="${{ inputs.service_name }}" + SERVICE_NAME_LOWER=$(echo "$SERVICE_NAME" | tr '[:upper:]' '[:lower:]') + SERVICE_NAME_UPPER=$(echo "$SERVICE_NAME" | tr '[:lower:]' '[:upper:]') + + echo "service_name_lower=$SERVICE_NAME_LOWER" >> $GITHUB_OUTPUT + echo "service_name_upper=$SERVICE_NAME_UPPER" >> $GITHUB_OUTPUT + echo "systemd_unit_name=AGEBD-SERVICE-${SERVICE_NAME_UPPER}.service" >> $GITHUB_OUTPUT + echo "service_dir=/sls/bd/hla/${{ inputs.environment }}/services/${SERVICE_NAME_LOWER}/current" >> $GITHUB_OUTPUT + + - name: Ensure service directory exists + run: | + mkdir -p ${{ steps.vars.outputs.service_dir }} + + - name: Sync service deployment files + run: | + rsync -avz --delete --exclude='.venv' \ + ./services/${{ steps.vars.outputs.service_name_lower }}/current/ \ + ${{ steps.vars.outputs.service_dir }}/ + + - name: Substitute environment variables & setup systemd service + run: | + SERVICE_DIR="${{ steps.vars.outputs.service_dir }}" + SYSTEMD_UNIT_NAME="${{ steps.vars.outputs.systemd_unit_name }}" + AGEBD_ENV="${{ inputs.environment }}" + + SYSTEMD_UNIT_FILE_PATH="${SERVICE_DIR}/systemd/${SYSTEMD_UNIT_NAME}" + if [ -f "\$SYSTEMD_UNIT_FILE_PATH" ]; then + sed -i "s/{{ *agebd_env *}}/${AGEBD_ENV}/g" "\$SYSTEMD_UNIT_FILE_PATH" + fi + + mkdir -p ~/.config/systemd/user + ln -sf "\$SYSTEMD_UNIT_FILE_PATH" "~/.config/systemd/user/${SYSTEMD_UNIT_NAME}" + + export XDG_RUNTIME_DIR="/run/user/\$(id -u)" + systemctl --user daemon-reload + systemctl --user enable "${SYSTEMD_UNIT_NAME}" + systemctl --user restart "${SYSTEMD_UNIT_NAME}" diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 09353e2..920780c 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -4,6 +4,8 @@ on: push: branches: - main + # TODO: remove + - chore/migrate-ansible-logic-to-workflow-steps tags: - 'prod' - 'v*' @@ -52,76 +54,62 @@ jobs: run: | cd scripts && uv run pytest - # TODO: maybe this is better: `rsync -av --delete ./ "${DEST_DIR}/"` # Sync everything perfectly, including hidden files, and delete old stale files - name: Bin - deploy if: steps.filter.outputs.bin == 'true' env: - # commit tagged ? yes->prod : no->dev - DEST_DIR: /sls/bd/hla/${{ github.ref_type == 'tag' && 'prod' || 'dev' }}/bin - working-directory: bin + DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/bin run: | mkdir -p ${DEST_DIR} - cp -r ./* ${DEST_DIR} + rsync -av --delete ./bin/ "${DEST_DIR}/" - # TODO: maybe this is better: `rsync -av --delete ./ "${DEST_DIR}/"` # Sync everything perfectly, including hidden files, and delete old stale files - name: Agebd - deploy if: steps.filter.outputs.agebd == 'true' env: - # commit tagged ? yes->prod : no->dev - DEST_DIR: /sls/bd/hla/${{ github.ref_type == 'tag' && 'prod' || 'dev' }}/packages/agebd - working-directory: packages/agebd + DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/packages/agebd run: | mkdir -p ${DEST_DIR} - cp -r ./* ${DEST_DIR} + rsync -av --delete ./packages/agebd/ "${DEST_DIR}/" - # TODO: maybe this is better: `rsync -av --delete ./ "${DEST_DIR}/"` # Sync everything perfectly, including hidden files, and delete old stale files - name: Qt - deploy if: steps.filter.outputs.qt == 'true' env: - # commit tagged ? yes->prod : no->dev - DEST_DIR: /sls/bd/hla/${{ github.ref_type == 'tag' && 'prod' || 'dev' }}/qt - working-directory: qt + DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/qt run: | mkdir -p ${DEST_DIR} - cp -r ./* ${DEST_DIR} + rsync -av --delete ./qt/ "${DEST_DIR}/" # TODO: (when) do we need to restart the master service or reinstall/restart the master ioc? - - name: Services - Initialize Virtual Environment from cli/uv.lock - if: steps.filter.outputs.services == 'true' + detect-changed-services: + runs-on: hla-dev + needs: [deploy] # Need filters + if: steps.filter.outputs.services == 'true' + outputs: + matrix: ${{ steps.set-matrix.outputs.matrix }} + steps: + - uses: actions/checkout@v4 + with: { fetch-depth: 0 } + - id: set-matrix run: | - uv venv .venv - uv sync --directory cli - - - name: Services - Install Ansible Galaxy Collections - if: steps.filter.outputs.services == 'true' - run: | - uv run ansible-galaxy collection install -r ansible/collections/requirements.yml -p ./ansible/installed-collections - - - name: Services - Run Ansible Orchestrator - if: steps.filter.outputs.services == 'true' - working-directory: ansible - run: | - set -x - - # Disable pipefail temporarily or add an '|| true' fallback so grep doesn't kill the script - set +e - CHANGED_FILES=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }}) - set -e - - # 1. Parse changed directory names into space-separated string (e.g. "master other-service") - CHANGED_SVC=$(echo "$CHANGED_FILES" | awk -F/ '$1=="services" {print $2}' | sort -u | xargs) - - echo "Detected changed services: '$CHANGED_SVC'" - - # Safely halt the execution if there is nothing to pass to Ansible - if [ -z "$CHANGED_SVC" ]; then - echo "No services changed in this commit range. Skipping deployment smoothly." - exit 0 + # Fallback if github.event.before is zeroed out (e.g. initial branch push or tag) + BEFORE="${{ github.event.before }}" + if [ -z "$BEFORE" ] || [ "$BEFORE" = "0000000000000000000000000000000000000000" ]; then + BEFORE="HEAD~1" fi + + # Generate JSON array of changed service folders + SERVICES=$(git diff --name-only "$BEFORE" "${{ github.sha }}" | awk -F/ '$1=="services" {print $2}' | sort -u | jq -R . | jq -s -c .) + echo "matrix=$SERVICES" >> $GITHUB_OUTPUT - # 3. Fire the playbook passing variables down - ansible-playbook playbooks/deploy-and-restart-modified-services.yml \ - -i "inventories/$AGEBD_ENV/hosts.yml" \ - --extra-vars="changed_services_raw='$CHANGED_SVC'" \ - -v + deploy-services: + needs: detect-services + if: ${{ needs.detect-services.outputs.matrix != '[]' }} + strategy: + fail-fast: false + matrix: + service: ${{ fromJson(needs.detect-services.outputs.matrix) }} + + uses: ./.gitea/workflows/deploy-service.yml + with: + service_name: ${{ matrix.service }} + environment: ${{ env.AGEBD_ENV }} -- 2.54.0 From b62fe0f362b7e099d972cb5ae76fb218f728b4ce Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 10:06:17 +0200 Subject: [PATCH 02/34] test cicd --- .gitea/workflows/deploy.yml | 5 ++--- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 18 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 920780c..15628d6 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -27,8 +27,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - with: - fetch-depth: 2 # needed for git diff tracking - name: Defined filter paths uses: actions/paths-filter@v3 # see: https://gitea.psi.ch/actions/paths-filter @@ -88,7 +86,8 @@ jobs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - uses: actions/checkout@v4 - with: { fetch-depth: 0 } + with: + fetch-depth: 0 - id: set-matrix run: | # Fallback if github.event.before is zeroed out (e.g. initial branch push or tag) diff --git a/bin/start_service.sh b/bin/start_service.sh index 24dda0c..7802abc 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 10 +# TODO: remove: cicd test 11 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 887b92d..36aff91 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 10 +# TODO: remove: cicd test 11 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index c37cc54..6ce9451 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 10 +# TODO: remove: cicd test 11 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index e0f95c5..7774bc5 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 10 +# TODO: remove: cicd test 11 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 141d067..bc9c5f6 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 10 +# TODO: remove: cicd test 11 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 32b23bf..9b42316 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 10 +# TODO: remove: cicd test 11 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 24b5c00..8c45e7f 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 10 +# TODO: remove: cicd test 11 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index f9e95ab..4a217ad 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 10 +# TODO: remove: cicd test 11 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 82a4d08..d7a2f6f 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 10 +# TODO: remove: cicd test 11 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 2b19800..194ce58 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 10 +# TODO: remove: cicd test 11 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index b4001a1..ed8bf62 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 10 +# TODO: remove: cicd test 11 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index c3fe8dc..a19bc77 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 10 +# TODO: remove: cicd test 11 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 4be29be..90eee71 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 10 +# TODO: remove: cicd test 11 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index f4b8e8a..f880629 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 10 +# TODO: remove: cicd test 11 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 0750964..9e83b61 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 10 +# TODO: remove: cicd test 11 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index fb3a0c9..160c4f3 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 10 +# TODO: remove: cicd test 11 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 5545f7f..5d14de6 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 10 +# TODO: remove: cicd test 11 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 04c2105c13cac9d061018336d72a06270bd23aca Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 10:09:37 +0200 Subject: [PATCH 03/34] fix: cicd --- .gitea/workflows/deploy.yml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 15628d6..d4c81be 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -17,14 +17,8 @@ on: jobs: - deploy: - runs-on: hla-dev - - env: - # commit tagged ? yes->prod : no->dev - AGEBD_ENV: ${{ github.ref_type == 'tag' && 'prod' || 'dev' }} - - steps: + runs-on: hla-dev + define-filters: - name: Checkout repository uses: actions/checkout@v4 @@ -42,6 +36,18 @@ jobs: services: - 'services/**' + deploy: + needs: define-filters + runs-on: hla-dev + + env: + # commit tagged ? yes->prod : no->dev + AGEBD_ENV: ${{ github.ref_type == 'tag' && 'prod' || 'dev' }} + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Install uv uses: actions/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0 @@ -80,7 +86,7 @@ jobs: detect-changed-services: runs-on: hla-dev - needs: [deploy] # Need filters + needs: define-filters if: steps.filter.outputs.services == 'true' outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} -- 2.54.0 From 95fbdd232c020f38e095940c61a49d8f4b557508 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 10:10:18 +0200 Subject: [PATCH 04/34] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 7802abc..84e993e 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 11 +# TODO: remove: cicd test 12 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 36aff91..cb6b0b0 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 11 +# TODO: remove: cicd test 12 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 6ce9451..012c5b8 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 11 +# TODO: remove: cicd test 12 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 7774bc5..e6acc1a 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 11 +# TODO: remove: cicd test 12 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index bc9c5f6..7ff185e 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 11 +# TODO: remove: cicd test 12 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 9b42316..21641a3 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 11 +# TODO: remove: cicd test 12 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 8c45e7f..244ed6a 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 11 +# TODO: remove: cicd test 12 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 4a217ad..3e7f83c 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 11 +# TODO: remove: cicd test 12 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index d7a2f6f..4e6a6ae 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 11 +# TODO: remove: cicd test 12 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 194ce58..22cef54 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 11 +# TODO: remove: cicd test 12 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index ed8bf62..4f01ca8 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 11 +# TODO: remove: cicd test 12 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index a19bc77..9074602 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 11 +# TODO: remove: cicd test 12 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 90eee71..31d17fc 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 11 +# TODO: remove: cicd test 12 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index f880629..2da81e7 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 11 +# TODO: remove: cicd test 12 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 9e83b61..59b12d2 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 11 +# TODO: remove: cicd test 12 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 160c4f3..049c4a9 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 11 +# TODO: remove: cicd test 12 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 5d14de6..1499486 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 11 +# TODO: remove: cicd test 12 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 4599e052d08dabc15264e85742976d92d10b737d Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 10:27:21 +0200 Subject: [PATCH 05/34] fix: cancel prevous running jobs --- .gitea/workflows/deploy.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index d4c81be..a8ab8ee 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -15,6 +15,10 @@ on: - 'qt/**' - 'services/**' +# 1. Cancel previous runs if a new commit is pushed to the same branch +concurrency: + group: deploy-${{ github.ref }} + cancel-in-progress: true jobs: runs-on: hla-dev -- 2.54.0 From f556c3a07f624194383466933effcc2249a6df52 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 10:27:54 +0200 Subject: [PATCH 06/34] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 84e993e..5ed93e3 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 12 +# TODO: remove: cicd test 13 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index cb6b0b0..d7a5163 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 12 +# TODO: remove: cicd test 13 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 012c5b8..8750355 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 12 +# TODO: remove: cicd test 13 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index e6acc1a..64d9c35 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 12 +# TODO: remove: cicd test 13 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 7ff185e..f9995e0 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 12 +# TODO: remove: cicd test 13 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 21641a3..c32c32a 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 12 +# TODO: remove: cicd test 13 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 244ed6a..304b223 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 12 +# TODO: remove: cicd test 13 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 3e7f83c..1063c9d 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 12 +# TODO: remove: cicd test 13 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 4e6a6ae..28a862e 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 12 +# TODO: remove: cicd test 13 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 22cef54..2d1c87d 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 12 +# TODO: remove: cicd test 13 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 4f01ca8..bdcbe34 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 12 +# TODO: remove: cicd test 13 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 9074602..44f6d77 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 12 +# TODO: remove: cicd test 13 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 31d17fc..f12802f 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 12 +# TODO: remove: cicd test 13 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 2da81e7..a1144dd 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 12 +# TODO: remove: cicd test 13 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 59b12d2..31bf21a 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 12 +# TODO: remove: cicd test 13 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 049c4a9..a05f9d3 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 12 +# TODO: remove: cicd test 13 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 1499486..77b7420 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 12 +# TODO: remove: cicd test 13 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From bbccf114c6449b22e71ff8b7f84d2f1baebd06b0 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 10:30:06 +0200 Subject: [PATCH 07/34] fix: cicd --- .gitea/workflows/deploy.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index a8ab8ee..964e1fe 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -21,8 +21,10 @@ concurrency: cancel-in-progress: true jobs: - runs-on: hla-dev define-filters: + runs-on: hla-dev + + steps: - name: Checkout repository uses: actions/checkout@v4 -- 2.54.0 From 522fa5e2fe95860872575926c3bca28e92baf27e Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 10:30:17 +0200 Subject: [PATCH 08/34] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 5ed93e3..6c22788 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 13 +# TODO: remove: cicd test 14 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index d7a5163..fdcc1f2 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 13 +# TODO: remove: cicd test 14 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 8750355..66c6bb0 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 13 +# TODO: remove: cicd test 14 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 64d9c35..3c5ce7e 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 13 +# TODO: remove: cicd test 14 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index f9995e0..bbf4efd 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 13 +# TODO: remove: cicd test 14 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index c32c32a..9482572 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 13 +# TODO: remove: cicd test 14 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 304b223..79708c2 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 13 +# TODO: remove: cicd test 14 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 1063c9d..9eeb2cd 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 13 +# TODO: remove: cicd test 14 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 28a862e..ad6bba3 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 13 +# TODO: remove: cicd test 14 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 2d1c87d..84f51fa 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 13 +# TODO: remove: cicd test 14 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index bdcbe34..a414d16 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 13 +# TODO: remove: cicd test 14 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 44f6d77..65e6e36 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 13 +# TODO: remove: cicd test 14 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index f12802f..a3d518a 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 13 +# TODO: remove: cicd test 14 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index a1144dd..10e0844 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 13 +# TODO: remove: cicd test 14 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 31bf21a..90db9ff 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 13 +# TODO: remove: cicd test 14 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index a05f9d3..54096c3 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 13 +# TODO: remove: cicd test 14 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 77b7420..074e918 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 13 +# TODO: remove: cicd test 14 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From fcf91d6ae93549cc7ca43a6fd1de1a876668e9ce Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 10:35:06 +0200 Subject: [PATCH 09/34] fix: cicd --- .gitea/workflows/deploy.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 964e1fe..392f1d4 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -24,6 +24,12 @@ jobs: define-filters: runs-on: hla-dev + outputs: + bin: ${{ needs.define-filters.outputs.bin }} + agebd: ${{ needs.define-filters.outputs.agebd }} + qt: ${{ needs.define-filters.outputs.qt }} + services: ${{ needs.define-filters.outputs.services }} + steps: - name: Checkout repository uses: actions/checkout@v4 @@ -65,7 +71,7 @@ jobs: cd scripts && uv run pytest - name: Bin - deploy - if: steps.filter.outputs.bin == 'true' + if: needs.define-filters.outputs.bin == 'true' env: DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/bin run: | @@ -73,7 +79,7 @@ jobs: rsync -av --delete ./bin/ "${DEST_DIR}/" - name: Agebd - deploy - if: steps.filter.outputs.agebd == 'true' + if: needs.define-filters.outputs.agebd == 'true' env: DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/packages/agebd run: | @@ -81,7 +87,7 @@ jobs: rsync -av --delete ./packages/agebd/ "${DEST_DIR}/" - name: Qt - deploy - if: steps.filter.outputs.qt == 'true' + if: needs.define-filters.outputs.qt == 'true' env: DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/qt run: | @@ -93,7 +99,7 @@ jobs: detect-changed-services: runs-on: hla-dev needs: define-filters - if: steps.filter.outputs.services == 'true' + if: needs.define-filters.outputs.services == 'true' outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: -- 2.54.0 From d090d751bc9389becb74d9bfbede6b50f7b9a9cc Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 10:35:21 +0200 Subject: [PATCH 10/34] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 6c22788..63bd84c 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 14 +# TODO: remove: cicd test 15 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index fdcc1f2..26a77b5 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 14 +# TODO: remove: cicd test 15 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 66c6bb0..96cfe31 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 14 +# TODO: remove: cicd test 15 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 3c5ce7e..66b7f65 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 14 +# TODO: remove: cicd test 15 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index bbf4efd..fbd9386 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 14 +# TODO: remove: cicd test 15 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 9482572..9620700 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 14 +# TODO: remove: cicd test 15 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 79708c2..d057a12 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 14 +# TODO: remove: cicd test 15 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 9eeb2cd..fc30765 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 14 +# TODO: remove: cicd test 15 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index ad6bba3..2f06bb6 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 14 +# TODO: remove: cicd test 15 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 84f51fa..267eac0 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 14 +# TODO: remove: cicd test 15 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index a414d16..2b03436 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 14 +# TODO: remove: cicd test 15 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 65e6e36..eb65f86 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 14 +# TODO: remove: cicd test 15 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index a3d518a..9e982e5 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 14 +# TODO: remove: cicd test 15 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 10e0844..04b1de9 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 14 +# TODO: remove: cicd test 15 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 90db9ff..1605c92 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 14 +# TODO: remove: cicd test 15 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 54096c3..f3572cc 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 14 +# TODO: remove: cicd test 15 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 074e918..66ac9b8 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 14 +# TODO: remove: cicd test 15 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 5dc4359e1481115b017771e773e357a3c334fe48 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 10:40:29 +0200 Subject: [PATCH 11/34] fix: cicd --- .gitea/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 392f1d4..294a745 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -51,6 +51,7 @@ jobs: deploy: needs: define-filters runs-on: hla-dev + if: !cancelled() && needs.define-filters.result != 'failure' env: # commit tagged ? yes->prod : no->dev -- 2.54.0 From 62f6a8818499157a153ffa628c34217f5cf771ba Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 10:40:43 +0200 Subject: [PATCH 12/34] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 63bd84c..76f793e 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 15 +# TODO: remove: cicd test 16 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 26a77b5..1a2961c 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 15 +# TODO: remove: cicd test 16 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 96cfe31..1231882 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 15 +# TODO: remove: cicd test 16 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 66b7f65..f23ab55 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 15 +# TODO: remove: cicd test 16 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index fbd9386..dd6258f 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 15 +# TODO: remove: cicd test 16 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 9620700..20d4e57 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 15 +# TODO: remove: cicd test 16 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index d057a12..0de7a73 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 15 +# TODO: remove: cicd test 16 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index fc30765..52f366f 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 15 +# TODO: remove: cicd test 16 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 2f06bb6..82b517f 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 15 +# TODO: remove: cicd test 16 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 267eac0..773c597 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 15 +# TODO: remove: cicd test 16 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 2b03436..70ca485 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 15 +# TODO: remove: cicd test 16 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index eb65f86..24d45e5 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 15 +# TODO: remove: cicd test 16 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 9e982e5..ea3ba9b 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 15 +# TODO: remove: cicd test 16 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 04b1de9..43b875b 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 15 +# TODO: remove: cicd test 16 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 1605c92..2b63032 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 15 +# TODO: remove: cicd test 16 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index f3572cc..3725b58 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 15 +# TODO: remove: cicd test 16 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 66ac9b8..e70160f 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 15 +# TODO: remove: cicd test 16 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From c4029e0a6d5a979226c8766d936a64a6a57a50f2 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 10:41:47 +0200 Subject: [PATCH 13/34] fix: cicd --- .gitea/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 294a745..70cdaad 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -51,7 +51,7 @@ jobs: deploy: needs: define-filters runs-on: hla-dev - if: !cancelled() && needs.define-filters.result != 'failure' + if: always() env: # commit tagged ? yes->prod : no->dev -- 2.54.0 From a0bfa4394601f4f9a5864ce0a4239cb401fae845 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 10:42:01 +0200 Subject: [PATCH 14/34] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 76f793e..ca3156a 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 16 +# TODO: remove: cicd test 17 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 1a2961c..e7e57e1 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 16 +# TODO: remove: cicd test 17 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 1231882..5c6849a 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 16 +# TODO: remove: cicd test 17 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index f23ab55..5fdeaad 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 16 +# TODO: remove: cicd test 17 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index dd6258f..0526350 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 16 +# TODO: remove: cicd test 17 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 20d4e57..45248e7 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 16 +# TODO: remove: cicd test 17 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 0de7a73..416dc7b 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 16 +# TODO: remove: cicd test 17 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 52f366f..0ccd247 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 16 +# TODO: remove: cicd test 17 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 82b517f..79756eb 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 16 +# TODO: remove: cicd test 17 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 773c597..2be0e0f 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 16 +# TODO: remove: cicd test 17 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 70ca485..e6e6d2c 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 16 +# TODO: remove: cicd test 17 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 24d45e5..e17db55 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 16 +# TODO: remove: cicd test 17 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index ea3ba9b..73ef91e 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 16 +# TODO: remove: cicd test 17 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 43b875b..185cbf2 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 16 +# TODO: remove: cicd test 17 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 2b63032..5704c33 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 16 +# TODO: remove: cicd test 17 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 3725b58..934e757 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 16 +# TODO: remove: cicd test 17 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index e70160f..5dcdcd7 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 16 +# TODO: remove: cicd test 17 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 1d1a0ba6ebb0794ceeeed16f8bfaa7ca2adb24e8 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 10:56:46 +0200 Subject: [PATCH 15/34] fix: cicd --- .gitea/workflows/deploy.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 70cdaad..cd04dfe 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -20,15 +20,19 @@ concurrency: group: deploy-${{ github.ref }} cancel-in-progress: true +env: + # commit tagged ? yes->prod : no->dev + AGEBD_ENV: ${{ github.ref_type == 'tag' && 'prod' || 'dev' }} + jobs: define-filters: runs-on: hla-dev outputs: - bin: ${{ needs.define-filters.outputs.bin }} - agebd: ${{ needs.define-filters.outputs.agebd }} - qt: ${{ needs.define-filters.outputs.qt }} - services: ${{ needs.define-filters.outputs.services }} + bin: ${{ steps.filter.outputs.bin }} + agebd: ${{ steps.filter.outputs.agebd }} + qt: ${{ steps.filter.outputs.qt }} + services: ${{ steps.filter.outputs.services }} steps: - name: Checkout repository @@ -53,10 +57,6 @@ jobs: runs-on: hla-dev if: always() - env: - # commit tagged ? yes->prod : no->dev - AGEBD_ENV: ${{ github.ref_type == 'tag' && 'prod' || 'dev' }} - steps: - name: Checkout repository uses: actions/checkout@v4 @@ -120,7 +120,7 @@ jobs: echo "matrix=$SERVICES" >> $GITHUB_OUTPUT deploy-services: - needs: detect-services + needs: detect-changed-services if: ${{ needs.detect-services.outputs.matrix != '[]' }} strategy: fail-fast: false -- 2.54.0 From 212bc53bf4bd9de34b01492fc565ccc66cc44e37 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 10:57:04 +0200 Subject: [PATCH 16/34] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index ca3156a..796999e 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 17 +# TODO: remove: cicd test 18 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index e7e57e1..35d8601 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 17 +# TODO: remove: cicd test 18 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 5c6849a..98cb5f1 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 17 +# TODO: remove: cicd test 18 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 5fdeaad..ea63c09 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 17 +# TODO: remove: cicd test 18 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 0526350..87d1a5b 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 17 +# TODO: remove: cicd test 18 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 45248e7..bae56b1 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 17 +# TODO: remove: cicd test 18 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 416dc7b..95a5f4c 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 17 +# TODO: remove: cicd test 18 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 0ccd247..753dcf5 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 17 +# TODO: remove: cicd test 18 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 79756eb..127a67e 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 17 +# TODO: remove: cicd test 18 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 2be0e0f..eb0f458 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 17 +# TODO: remove: cicd test 18 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index e6e6d2c..5f31a2d 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 17 +# TODO: remove: cicd test 18 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index e17db55..b90e169 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 17 +# TODO: remove: cicd test 18 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 73ef91e..b7763f5 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 17 +# TODO: remove: cicd test 18 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 185cbf2..72f4d52 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 17 +# TODO: remove: cicd test 18 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 5704c33..4bc3a14 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 17 +# TODO: remove: cicd test 18 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 934e757..c2cccc7 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 17 +# TODO: remove: cicd test 18 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 5dcdcd7..e217c03 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 17 +# TODO: remove: cicd test 18 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From b22e6967b4cba44334012b4f4374fba7adee580a Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 11:00:09 +0200 Subject: [PATCH 17/34] fix: cicd --- .gitea/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index cd04dfe..b8d7476 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -77,7 +77,7 @@ jobs: DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/bin run: | mkdir -p ${DEST_DIR} - rsync -av --delete ./bin/ "${DEST_DIR}/" + rsync -av --delete --exclude='.nfs*' ./bin/ "${DEST_DIR}/" - name: Agebd - deploy if: needs.define-filters.outputs.agebd == 'true' @@ -85,7 +85,7 @@ jobs: DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/packages/agebd run: | mkdir -p ${DEST_DIR} - rsync -av --delete ./packages/agebd/ "${DEST_DIR}/" + rsync -av --delete --exclude='.nfs*' ./packages/agebd/ "${DEST_DIR}/" - name: Qt - deploy if: needs.define-filters.outputs.qt == 'true' @@ -93,7 +93,7 @@ jobs: DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/qt run: | mkdir -p ${DEST_DIR} - rsync -av --delete ./qt/ "${DEST_DIR}/" + rsync -av --delete --exclude='.nfs*' ./qt/ "${DEST_DIR}/" # TODO: (when) do we need to restart the master service or reinstall/restart the master ioc? -- 2.54.0 From efab57f70b7659d657f75928992dac8d8712a3c1 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 11:00:21 +0200 Subject: [PATCH 18/34] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 796999e..d4fe398 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 18 +# TODO: remove: cicd test 19 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 35d8601..b6d8d41 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 18 +# TODO: remove: cicd test 19 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 98cb5f1..200efd2 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 18 +# TODO: remove: cicd test 19 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index ea63c09..4328c1e 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 18 +# TODO: remove: cicd test 19 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 87d1a5b..9dec8ca 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 18 +# TODO: remove: cicd test 19 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index bae56b1..4230755 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 18 +# TODO: remove: cicd test 19 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 95a5f4c..b82d6dc 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 18 +# TODO: remove: cicd test 19 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 753dcf5..c29349b 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 18 +# TODO: remove: cicd test 19 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 127a67e..ff06a4a 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 18 +# TODO: remove: cicd test 19 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index eb0f458..36580cd 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 18 +# TODO: remove: cicd test 19 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 5f31a2d..310a82c 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 18 +# TODO: remove: cicd test 19 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index b90e169..9003486 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 18 +# TODO: remove: cicd test 19 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index b7763f5..5d1d4ee 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 18 +# TODO: remove: cicd test 19 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 72f4d52..fa00db5 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 18 +# TODO: remove: cicd test 19 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 4bc3a14..24b03b4 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 18 +# TODO: remove: cicd test 19 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index c2cccc7..c5ff736 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 18 +# TODO: remove: cicd test 19 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index e217c03..2a1b7c4 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 18 +# TODO: remove: cicd test 19 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 922409891fc2cb151c7e0feea8e9de8d90eb9869 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 11:04:47 +0200 Subject: [PATCH 19/34] fix: cicd --- .gitea/workflows/deploy.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index b8d7476..d39103e 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -55,7 +55,6 @@ jobs: deploy: needs: define-filters runs-on: hla-dev - if: always() steps: - name: Checkout repository @@ -101,13 +100,17 @@ jobs: runs-on: hla-dev needs: define-filters if: needs.define-filters.outputs.services == 'true' + outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} + steps: - uses: actions/checkout@v4 with: fetch-depth: 0 - - id: set-matrix + + - name: Generate matrix of changed services + id: set-matrix run: | # Fallback if github.event.before is zeroed out (e.g. initial branch push or tag) BEFORE="${{ github.event.before }}" @@ -120,8 +123,9 @@ jobs: echo "matrix=$SERVICES" >> $GITHUB_OUTPUT deploy-services: + name: "Deploy Service (${{ matrix.service }})" needs: detect-changed-services - if: ${{ needs.detect-services.outputs.matrix != '[]' }} + if: ${{ needs.detect-changed-services.outputs.matrix != '[]' }} strategy: fail-fast: false matrix: -- 2.54.0 From 84bb75e7c6fd7d1c9f50745b66827a17058ebf44 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 11:04:59 +0200 Subject: [PATCH 20/34] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index d4fe398..8978010 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 19 +# TODO: remove: cicd test 20 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index b6d8d41..cd28093 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 19 +# TODO: remove: cicd test 20 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 200efd2..1ee8292 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 19 +# TODO: remove: cicd test 20 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 4328c1e..9404a3d 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 19 +# TODO: remove: cicd test 20 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 9dec8ca..b78ffaf 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 19 +# TODO: remove: cicd test 20 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 4230755..e1fee9a 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 19 +# TODO: remove: cicd test 20 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index b82d6dc..07a78a8 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 19 +# TODO: remove: cicd test 20 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index c29349b..5ec4bd3 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 19 +# TODO: remove: cicd test 20 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index ff06a4a..2892219 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 19 +# TODO: remove: cicd test 20 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 36580cd..91c29c9 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 19 +# TODO: remove: cicd test 20 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 310a82c..a5335b5 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 19 +# TODO: remove: cicd test 20 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 9003486..888fb1b 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 19 +# TODO: remove: cicd test 20 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 5d1d4ee..28e395a 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 19 +# TODO: remove: cicd test 20 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index fa00db5..c1dea8b 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 19 +# TODO: remove: cicd test 20 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 24b03b4..7d2275e 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 19 +# TODO: remove: cicd test 20 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index c5ff736..3e51c0c 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 19 +# TODO: remove: cicd test 20 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 2a1b7c4..fe50faf 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 19 +# TODO: remove: cicd test 20 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From e3f530574ddc8f46b335c5a413cb4e685f34104a Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 11:06:36 +0200 Subject: [PATCH 21/34] fix: cicd --- .gitea/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index d39103e..b677256 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -129,7 +129,7 @@ jobs: strategy: fail-fast: false matrix: - service: ${{ fromJson(needs.detect-services.outputs.matrix) }} + service: ${{ fromJson(needs.detect-changed-services.outputs.matrix) }} uses: ./.gitea/workflows/deploy-service.yml with: -- 2.54.0 From 2ea424bade7a61147163986aed44d4a687e57911 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 11:06:47 +0200 Subject: [PATCH 22/34] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 8978010..bb052f4 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 20 +# TODO: remove: cicd test 21 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index cd28093..2fb10fb 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 20 +# TODO: remove: cicd test 21 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 1ee8292..060d93a 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 20 +# TODO: remove: cicd test 21 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 9404a3d..a32a388 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 20 +# TODO: remove: cicd test 21 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index b78ffaf..71038b9 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 20 +# TODO: remove: cicd test 21 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index e1fee9a..8fed0e2 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 20 +# TODO: remove: cicd test 21 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 07a78a8..9e12ec5 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 20 +# TODO: remove: cicd test 21 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 5ec4bd3..e1dde52 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 20 +# TODO: remove: cicd test 21 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 2892219..117762d 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 20 +# TODO: remove: cicd test 21 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 91c29c9..dbfa1d3 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 20 +# TODO: remove: cicd test 21 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index a5335b5..6470712 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 20 +# TODO: remove: cicd test 21 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 888fb1b..3e80bfa 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 20 +# TODO: remove: cicd test 21 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 28e395a..20c9db5 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 20 +# TODO: remove: cicd test 21 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index c1dea8b..c071833 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 20 +# TODO: remove: cicd test 21 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 7d2275e..d183057 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 20 +# TODO: remove: cicd test 21 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 3e51c0c..240fd61 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 20 +# TODO: remove: cicd test 21 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index fe50faf..c578ef5 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 20 +# TODO: remove: cicd test 21 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From af606047db7cabc7dbd2e37a00095bf761ea6615 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 12:01:25 +0200 Subject: [PATCH 23/34] fix: cicd --- .gitea/scripts/deploy-service.sh | 29 +++++++++++++++++++++++++++ .gitea/workflows/deploy.yml | 34 +++++++++++++++++++++----------- 2 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 .gitea/scripts/deploy-service.sh diff --git a/.gitea/scripts/deploy-service.sh b/.gitea/scripts/deploy-service.sh new file mode 100644 index 0000000..ba5aa4b --- /dev/null +++ b/.gitea/scripts/deploy-service.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +SERVICE_NAME=$1 +AGEBD_ENV=$2 + +SERVICE_NAME_LOWER=$(echo "$SERVICE_NAME" | tr '[:upper:]' '[:lower:]') +SERVICE_NAME_UPPER=$(echo "$SERVICE_NAME" | tr '[:lower:]' '[:upper:]') +SERVICE_DIR=/sls/bd/hla/${AGEBD_ENV}/services/${SERVICE_NAME_LOWER}/current +SYSTEMD_UNIT_NAME=AGEBD-SERVICE-${SERVICE_NAME_UPPER}.service +SYSTEMD_UNIT_FILE_PATH=${SERVICE_DIR}/systemd/${SYSTEMD_UNIT_NAME} + +mkdir -p ${SERVICE_DIR} + +rsync -avz --delete --exclude='.venv' \ + ./services/${SERVICE_NAME_LOWER}/current/ \ + ${SERVICE_DIR}/ + + +if [ -f "${SYSTEMD_UNIT_FILE_PATH}" ]; then + sed -i "s/{{ *agebd_env* }}/${AGEBD_ENV}/g" "${SYSTEMD_UNIT_FILE_PATH}" +fi + +mkdir -p ${HOME}/.config/systemd/user +ln -sf "${SYSTEMD_UNIT_FILE_PATH}" "${HOME}/.config/systemd/user/${SYSTEMD_UNIT_NAME}" + +export XDG_RUNTIME_DIR="/run/user/\$(id -u)" +systemctl --user daemon-reload +systemctl --user enable "${SYSTEMD_UNIT_NAME}" +systemctl --user restart "${SYSTEMD_UNIT_NAME}" diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index b677256..3c248c9 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -123,15 +123,27 @@ jobs: echo "matrix=$SERVICES" >> $GITHUB_OUTPUT deploy-services: - name: "Deploy Service (${{ matrix.service }})" needs: detect-changed-services - if: ${{ needs.detect-changed-services.outputs.matrix != '[]' }} - strategy: - fail-fast: false - matrix: - service: ${{ fromJson(needs.detect-changed-services.outputs.matrix) }} - - uses: ./.gitea/workflows/deploy-service.yml - with: - service_name: ${{ matrix.service }} - environment: ${{ env.AGEBD_ENV }} + runs-on: hla-dev + if: needs.detect-changed-services.outputs.matrix != '[]' && needs.detect-changed-services.outputs.matrix != '' + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Deploy Changed Services + run: | + # Parse JSON array produced by detect-changed-services + SERVICES_JSON='${{ needs.detect-changed-services.outputs.matrix }}' + + echo "Services to deploy: $SERVICES_JSON" + + # Iterate over each service and deploy + echo "$SERVICES_JSON" | jq -r '.[]' | while read -r SERVICE; do + if [ -z "$SERVICE" ]; then continue; fi + + echo "==========================================" + echo "Deploying service: $SERVICE (${{ env.AGEBD_ENV }})" + echo "==========================================" + + ./.gitea/scripts/deploy-service.sh ${SERVICE} ${{ env.AGEBD_ENV }} + done -- 2.54.0 From 4cc4baab4db7d0d05bb2ec6dc00280fe742986f6 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 12:01:51 +0200 Subject: [PATCH 24/34] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index bb052f4..b24aa7e 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 21 +# TODO: remove: cicd test 22 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 2fb10fb..5625a0a 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 21 +# TODO: remove: cicd test 22 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 060d93a..83f0b54 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 21 +# TODO: remove: cicd test 22 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index a32a388..bde38f8 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 21 +# TODO: remove: cicd test 22 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 71038b9..88fde56 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 21 +# TODO: remove: cicd test 22 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 8fed0e2..18017de 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 21 +# TODO: remove: cicd test 22 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 9e12ec5..9ed1670 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 21 +# TODO: remove: cicd test 22 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index e1dde52..d890c91 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 21 +# TODO: remove: cicd test 22 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 117762d..63f645a 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 21 +# TODO: remove: cicd test 22 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index dbfa1d3..eaeb5b1 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 21 +# TODO: remove: cicd test 22 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 6470712..8f49d2b 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 21 +# TODO: remove: cicd test 22 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 3e80bfa..9e2f554 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 21 +# TODO: remove: cicd test 22 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 20c9db5..0b11900 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 21 +# TODO: remove: cicd test 22 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index c071833..c576af3 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 21 +# TODO: remove: cicd test 22 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index d183057..c4beadf 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 21 +# TODO: remove: cicd test 22 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 240fd61..ffc502e 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 21 +# TODO: remove: cicd test 22 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index c578ef5..f2ce49d 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 21 +# TODO: remove: cicd test 22 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From baa89433f1d9eeb6e9fdd17de2f63a564d1c8ba7 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 12:02:40 +0200 Subject: [PATCH 25/34] fix: cicd --- .gitea/scripts/deploy-service.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .gitea/scripts/deploy-service.sh diff --git a/.gitea/scripts/deploy-service.sh b/.gitea/scripts/deploy-service.sh old mode 100644 new mode 100755 -- 2.54.0 From 878c3bba1664efd7e7005f818d3374ab8d66b0b7 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 12:02:54 +0200 Subject: [PATCH 26/34] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index b24aa7e..ef6c14b 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 22 +# TODO: remove: cicd test 23 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 5625a0a..782ba29 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 22 +# TODO: remove: cicd test 23 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 83f0b54..40c809a 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 22 +# TODO: remove: cicd test 23 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index bde38f8..99b6370 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 22 +# TODO: remove: cicd test 23 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 88fde56..b4154d2 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 22 +# TODO: remove: cicd test 23 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 18017de..d31d7a9 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 22 +# TODO: remove: cicd test 23 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 9ed1670..b161ac0 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 22 +# TODO: remove: cicd test 23 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index d890c91..b694ed8 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 22 +# TODO: remove: cicd test 23 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 63f645a..827ca76 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 22 +# TODO: remove: cicd test 23 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index eaeb5b1..4e205b7 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 22 +# TODO: remove: cicd test 23 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 8f49d2b..ee5222c 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 22 +# TODO: remove: cicd test 23 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 9e2f554..eb3b6be 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 22 +# TODO: remove: cicd test 23 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 0b11900..c4d04c2 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 22 +# TODO: remove: cicd test 23 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index c576af3..21786fc 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 22 +# TODO: remove: cicd test 23 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index c4beadf..7bbfdea 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 22 +# TODO: remove: cicd test 23 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index ffc502e..8b80680 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 22 +# TODO: remove: cicd test 23 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index f2ce49d..f996729 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 22 +# TODO: remove: cicd test 23 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 057bf91b16726906efd6d2af6fa2ed19c52eb12e Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 12:04:24 +0200 Subject: [PATCH 27/34] fix: cicd --- .gitea/scripts/deploy-service.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/scripts/deploy-service.sh b/.gitea/scripts/deploy-service.sh index ba5aa4b..7218809 100755 --- a/.gitea/scripts/deploy-service.sh +++ b/.gitea/scripts/deploy-service.sh @@ -23,7 +23,7 @@ fi mkdir -p ${HOME}/.config/systemd/user ln -sf "${SYSTEMD_UNIT_FILE_PATH}" "${HOME}/.config/systemd/user/${SYSTEMD_UNIT_NAME}" -export XDG_RUNTIME_DIR="/run/user/\$(id -u)" +export XDG_RUNTIME_DIR="/run/user/$(id -u)" systemctl --user daemon-reload systemctl --user enable "${SYSTEMD_UNIT_NAME}" systemctl --user restart "${SYSTEMD_UNIT_NAME}" -- 2.54.0 From 71574cee2df5f4d675c6f7e5c03e4fffe3860776 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 12:04:36 +0200 Subject: [PATCH 28/34] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index ef6c14b..77c2e91 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 23 +# TODO: remove: cicd test 24 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 782ba29..a80760d 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 23 +# TODO: remove: cicd test 24 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 40c809a..122ddfb 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 23 +# TODO: remove: cicd test 24 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 99b6370..e4ba1ad 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 23 +# TODO: remove: cicd test 24 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index b4154d2..2535471 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 23 +# TODO: remove: cicd test 24 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index d31d7a9..9ad6041 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 23 +# TODO: remove: cicd test 24 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index b161ac0..567f547 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 23 +# TODO: remove: cicd test 24 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index b694ed8..c00d3dc 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 23 +# TODO: remove: cicd test 24 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 827ca76..5a63f64 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 23 +# TODO: remove: cicd test 24 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 4e205b7..1954468 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 23 +# TODO: remove: cicd test 24 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index ee5222c..197b67a 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 23 +# TODO: remove: cicd test 24 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index eb3b6be..be27ffc 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 23 +# TODO: remove: cicd test 24 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index c4d04c2..3510c70 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 23 +# TODO: remove: cicd test 24 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 21786fc..70c1cc1 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 23 +# TODO: remove: cicd test 24 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 7bbfdea..d09684f 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 23 +# TODO: remove: cicd test 24 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 8b80680..6a2d6a7 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 23 +# TODO: remove: cicd test 24 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index f996729..ac374df 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 23 +# TODO: remove: cicd test 24 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 93b914321d1a59e62e63d74272ff13f5669e315f Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 12:06:49 +0200 Subject: [PATCH 29/34] fix: cicd --- .gitea/scripts/deploy-service.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitea/scripts/deploy-service.sh b/.gitea/scripts/deploy-service.sh index 7218809..4bc01d5 100755 --- a/.gitea/scripts/deploy-service.sh +++ b/.gitea/scripts/deploy-service.sh @@ -3,6 +3,10 @@ SERVICE_NAME=$1 AGEBD_ENV=$2 +echo "==========================================" +echo "Deploying service: $SERVICE_NAME (${AGEBD_ENV})" +echo "==========================================" + SERVICE_NAME_LOWER=$(echo "$SERVICE_NAME" | tr '[:upper:]' '[:lower:]') SERVICE_NAME_UPPER=$(echo "$SERVICE_NAME" | tr '[:lower:]' '[:upper:]') SERVICE_DIR=/sls/bd/hla/${AGEBD_ENV}/services/${SERVICE_NAME_LOWER}/current -- 2.54.0 From d30a59f665c93bb15d849165b99d8c1312efac68 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 12:06:59 +0200 Subject: [PATCH 30/34] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 77c2e91..d48b584 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 24 +# TODO: remove: cicd test 25 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index a80760d..8b5e67a 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 24 +# TODO: remove: cicd test 25 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 122ddfb..53cc510 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 24 +# TODO: remove: cicd test 25 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index e4ba1ad..e87677c 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 24 +# TODO: remove: cicd test 25 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 2535471..dca2fc8 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 24 +# TODO: remove: cicd test 25 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 9ad6041..832618f 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 24 +# TODO: remove: cicd test 25 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 567f547..1843d00 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 24 +# TODO: remove: cicd test 25 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index c00d3dc..42d34b5 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 24 +# TODO: remove: cicd test 25 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 5a63f64..66bbba1 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 24 +# TODO: remove: cicd test 25 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 1954468..5d64f8f 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 24 +# TODO: remove: cicd test 25 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 197b67a..478aaa7 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 24 +# TODO: remove: cicd test 25 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index be27ffc..351fb63 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 24 +# TODO: remove: cicd test 25 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 3510c70..e42bc6c 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 24 +# TODO: remove: cicd test 25 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 70c1cc1..5149a11 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 24 +# TODO: remove: cicd test 25 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index d09684f..7b2f1d6 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 24 +# TODO: remove: cicd test 25 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 6a2d6a7..a8aac01 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 24 +# TODO: remove: cicd test 25 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index ac374df..019af98 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 24 +# TODO: remove: cicd test 25 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 8ab849d86de0939bf296d3d3272fe131662ee6d1 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 12:11:44 +0200 Subject: [PATCH 31/34] fix: cicd --- .gitea/workflows/deploy.yml | 100 ++++++++++++------------------------ 1 file changed, 33 insertions(+), 67 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 3c248c9..ecf4335 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -15,7 +15,7 @@ on: - 'qt/**' - 'services/**' -# 1. Cancel previous runs if a new commit is pushed to the same branch +# Cancel previous runs if a new commit is pushed to the same branch concurrency: group: deploy-${{ github.ref }} cancel-in-progress: true @@ -25,21 +25,17 @@ env: AGEBD_ENV: ${{ github.ref_type == 'tag' && 'prod' || 'dev' }} jobs: - define-filters: + deploy: runs-on: hla-dev - outputs: - bin: ${{ steps.filter.outputs.bin }} - agebd: ${{ steps.filter.outputs.agebd }} - qt: ${{ steps.filter.outputs.qt }} - services: ${{ steps.filter.outputs.services }} - steps: - name: Checkout repository uses: actions/checkout@v4 + with: + fetch-depth: 0 # Needed for git diff in service detection - - name: Defined filter paths - uses: actions/paths-filter@v3 # see: https://gitea.psi.ch/actions/paths-filter + - name: Define filter paths + uses: actions/paths-filter@v3 id: filter with: filters: | @@ -52,16 +48,8 @@ jobs: services: - 'services/**' - deploy: - needs: define-filters - runs-on: hla-dev - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - name: Install uv - uses: actions/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0 + uses: actions/setup-uv@v5 - name: Install Python 3.10 run: uv python install 3.10 @@ -70,80 +58,58 @@ jobs: run: | cd scripts && uv run pytest + # ----------------------------------------------------------------- + # Directory Deployments + # ----------------------------------------------------------------- - name: Bin - deploy - if: needs.define-filters.outputs.bin == 'true' + if: steps.filter.outputs.bin == 'true' env: DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/bin run: | - mkdir -p ${DEST_DIR} + mkdir -p "${DEST_DIR}" rsync -av --delete --exclude='.nfs*' ./bin/ "${DEST_DIR}/" - name: Agebd - deploy - if: needs.define-filters.outputs.agebd == 'true' + if: steps.filter.outputs.agebd == 'true' env: DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/packages/agebd run: | - mkdir -p ${DEST_DIR} + mkdir -p "${DEST_DIR}" rsync -av --delete --exclude='.nfs*' ./packages/agebd/ "${DEST_DIR}/" - name: Qt - deploy - if: needs.define-filters.outputs.qt == 'true' + if: steps.filter.outputs.qt == 'true' env: DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/qt run: | - mkdir -p ${DEST_DIR} + mkdir -p "${DEST_DIR}" rsync -av --delete --exclude='.nfs*' ./qt/ "${DEST_DIR}/" - # TODO: (when) do we need to restart the master service or reinstall/restart the master ioc? - - detect-changed-services: - runs-on: hla-dev - needs: define-filters - if: needs.define-filters.outputs.services == 'true' - - outputs: - matrix: ${{ steps.set-matrix.outputs.matrix }} - - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Generate matrix of changed services - id: set-matrix + # ----------------------------------------------------------------- + # Services Deployment + # ----------------------------------------------------------------- + - name: Deploy Changed Services + if: steps.filter.outputs.services == 'true' run: | - # Fallback if github.event.before is zeroed out (e.g. initial branch push or tag) + # 1. Determine git comparison point BEFORE="${{ github.event.before }}" if [ -z "$BEFORE" ] || [ "$BEFORE" = "0000000000000000000000000000000000000000" ]; then BEFORE="HEAD~1" fi - - # Generate JSON array of changed service folders - SERVICES=$(git diff --name-only "$BEFORE" "${{ github.sha }}" | awk -F/ '$1=="services" {print $2}' | sort -u | jq -R . | jq -s -c .) - echo "matrix=$SERVICES" >> $GITHUB_OUTPUT - deploy-services: - needs: detect-changed-services - runs-on: hla-dev - if: needs.detect-changed-services.outputs.matrix != '[]' && needs.detect-changed-services.outputs.matrix != '' - steps: - - name: Checkout repository - uses: actions/checkout@v4 + # 2. Extract list of modified service folder names + CHANGED_SERVICES=$(git diff --name-only "$BEFORE" "${{ github.sha }}" | awk -F/ '$1=="services" && $2!="" {print $2}' | sort -u) - - name: Deploy Changed Services - run: | - # Parse JSON array produced by detect-changed-services - SERVICES_JSON='${{ needs.detect-changed-services.outputs.matrix }}' - - echo "Services to deploy: $SERVICES_JSON" - - # Iterate over each service and deploy - echo "$SERVICES_JSON" | jq -r '.[]' | while read -r SERVICE; do - if [ -z "$SERVICE" ]; then continue; fi - + if [ -z "$CHANGED_SERVICES" ]; then + echo "No service directory changes detected in diff." + exit 0 + fi + + # 3. Loop through changed services and invoke deployment script + echo "$CHANGED_SERVICES" | while read -r SERVICE; do echo "==========================================" - echo "Deploying service: $SERVICE (${{ env.AGEBD_ENV }})" + echo "Deploying service: ${SERVICE} (${AGEBD_ENV})" echo "==========================================" - ./.gitea/scripts/deploy-service.sh ${SERVICE} ${{ env.AGEBD_ENV }} + ./.gitea/scripts/deploy-service.sh "${SERVICE}" "${AGEBD_ENV}" done -- 2.54.0 From ecac78889e35199c5f53407d01f910f360fba73c Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 12:11:58 +0200 Subject: [PATCH 32/34] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index d48b584..ce12f1a 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 25 +# TODO: remove: cicd test 26 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 8b5e67a..88db81f 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 25 +# TODO: remove: cicd test 26 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 53cc510..8976d38 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 25 +# TODO: remove: cicd test 26 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index e87677c..4be6b36 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 25 +# TODO: remove: cicd test 26 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index dca2fc8..562c65d 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 25 +# TODO: remove: cicd test 26 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 832618f..34f4e6e 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 25 +# TODO: remove: cicd test 26 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 1843d00..74b1b1b 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 25 +# TODO: remove: cicd test 26 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 42d34b5..7a81b9d 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 25 +# TODO: remove: cicd test 26 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 66bbba1..cba0182 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 25 +# TODO: remove: cicd test 26 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 5d64f8f..41a617f 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 25 +# TODO: remove: cicd test 26 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 478aaa7..bae3362 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 25 +# TODO: remove: cicd test 26 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 351fb63..108a8ad 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 25 +# TODO: remove: cicd test 26 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index e42bc6c..9411ce4 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 25 +# TODO: remove: cicd test 26 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 5149a11..4ac9a8c 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 25 +# TODO: remove: cicd test 26 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 7b2f1d6..0796a71 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 25 +# TODO: remove: cicd test 26 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index a8aac01..6fb3e8a 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 25 +# TODO: remove: cicd test 26 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 019af98..42f00cc 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 25 +# TODO: remove: cicd test 26 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 575e6c62ea21a1e24e47d2dcb05ae69a6290b658 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 13:21:57 +0200 Subject: [PATCH 33/34] migrate add new service --- ...rvice.sh => deploy-and-restart-service.sh} | 0 .gitea/workflows/add-new-service-ansible.yml | 73 ------------------- .gitea/workflows/add-new-service.yml | 17 +++++ .gitea/workflows/deploy-py-agebd-pypi.yml | 13 ---- .gitea/workflows/deploy-service.yml | 63 ---------------- .gitea/workflows/deploy.yml | 6 +- 6 files changed, 18 insertions(+), 154 deletions(-) rename .gitea/scripts/{deploy-service.sh => deploy-and-restart-service.sh} (100%) delete mode 100644 .gitea/workflows/add-new-service-ansible.yml delete mode 100644 .gitea/workflows/deploy-py-agebd-pypi.yml delete mode 100644 .gitea/workflows/deploy-service.yml diff --git a/.gitea/scripts/deploy-service.sh b/.gitea/scripts/deploy-and-restart-service.sh similarity index 100% rename from .gitea/scripts/deploy-service.sh rename to .gitea/scripts/deploy-and-restart-service.sh diff --git a/.gitea/workflows/add-new-service-ansible.yml b/.gitea/workflows/add-new-service-ansible.yml deleted file mode 100644 index 1471f16..0000000 --- a/.gitea/workflows/add-new-service-ansible.yml +++ /dev/null @@ -1,73 +0,0 @@ -name: Add new service - -on: - push: - branches: - - 'feature/add-service-*' - -# TODO: when to deploy to prod? Manual (i.e. cli command)? -jobs: - deploy: - runs-on: hla-dev - - env: - ANSIBLE_CONFIG: "${{ github.workspace }}/ansible/ansible.cfg" - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Install and setup uv - uses: actions/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0 - with: - version: "latest" - enable-cache: true # Speeds up runs by caching python dependencies # TODO: does this work? - - - name: Install Python 3.10 - run: uv python install 3.10 - - - name: Run tests - run: | - cd cli && uv run pytest - - - name: Parse Service Directory Name - id: parse_branch - # Uses bash shell parameter elimination to strip 'feature/add-service-' from the front - run: | - BRANCH="${{ github.ref_name }}" - SERVICE_NAME="${BRANCH#feature/add-service-}" - echo "service_name_lower=$SERVICE_NAME" >> $GITHUB_OUTPUT - - # TODO: look into venv caching (will do later in case we move from uv to pixi) - # - name: Cache Python Virtual Environment - # uses: actions/cache@v4 - # with: - # path: .venv - # # Changes uv.lock will automatically invalidate the cache and rebuild - # key: ${{ runner.os }}-uv-cli-venv-${{ hashFiles('cli/uv.lock') }} - # restore-keys: | - # ${{ runner.os }}-uv-cli-venv- - - # # Only create the venv if the cache didn't restore an existing one - # if [ ! -d ".venv" ]; then - # echo "Building new .venv" - # uv venv .venv - # fi - - name: Initialize Virtual Environment from cli/uv.lock - run: | - uv venv .venv - uv sync --directory cli - - - name: Install Ansible Galaxy Collections - run: | - uv run ansible-galaxy collection install -r ansible/collections/requirements.yml -p ./ansible/installed-collections - - # TODO: dev/prod - - name: Run New Service Playbook - working-directory: ansible - run: | - uv run ansible-playbook playbooks/add-new-service.yml \ - -i "inventories/dev/hosts.yml" \ - --extra-vars="repo_root=${{ github.workspace }}" \ - --extra-vars="service_name_lower=${{ steps.parse_branch.outputs.service_name_lower }}" \ - -v diff --git a/.gitea/workflows/add-new-service.yml b/.gitea/workflows/add-new-service.yml index c32fa0e..dc6ae77 100644 --- a/.gitea/workflows/add-new-service.yml +++ b/.gitea/workflows/add-new-service.yml @@ -34,3 +34,20 @@ jobs: BRANCH="${{ github.ref_name }}" SERVICE_NAME="${BRANCH#feature/add-service-}" echo "service_name_lower=$SERVICE_NAME" >> $GITHUB_OUTPUT + + # - name: Install Master IOC + + # - name: Restart Master IOC + + - name: Deploy and Restart Master Service + run: | + ./.gitea/scripts/deploy-and-restart-service.sh "master" "dev" + + # - name: Install New IOC + + # - name: Start New IOC + + - name: Deploy and Restart New Service + run: | + SERVICE_NAME=${{ steps.parse_branch.outputs.service_name_lower }} + ./.gitea/scripts/deploy-and-restart-service.sh "${SERVICE_NAME}" "dev" diff --git a/.gitea/workflows/deploy-py-agebd-pypi.yml b/.gitea/workflows/deploy-py-agebd-pypi.yml deleted file mode 100644 index 87b5b24..0000000 --- a/.gitea/workflows/deploy-py-agebd-pypi.yml +++ /dev/null @@ -1,13 +0,0 @@ -# name: Deploy agebd python package to gitea/pypi -# -# # TODO: services depend on this workflow -# on: -# push: -# branches: -# - main -# paths: -# - 'packages/agebd/**' -# -# jobs: -# deploy: -# runs-on: hla-dev diff --git a/.gitea/workflows/deploy-service.yml b/.gitea/workflows/deploy-service.yml deleted file mode 100644 index 39c8ec3..0000000 --- a/.gitea/workflows/deploy-service.yml +++ /dev/null @@ -1,63 +0,0 @@ -name: Service Deployer - -on: - workflow_call: - inputs: - service_name: - required: true - type: string - description: "Target service name lower (e.g. master)" - environment: - required: true - type: string - # default: "dev" - description: "Target deployment environment: 'dev' or 'prod'" - -jobs: - deploy: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Resolve service name parameters - id: vars - run: | - SERVICE_NAME="${{ inputs.service_name }}" - SERVICE_NAME_LOWER=$(echo "$SERVICE_NAME" | tr '[:upper:]' '[:lower:]') - SERVICE_NAME_UPPER=$(echo "$SERVICE_NAME" | tr '[:lower:]' '[:upper:]') - - echo "service_name_lower=$SERVICE_NAME_LOWER" >> $GITHUB_OUTPUT - echo "service_name_upper=$SERVICE_NAME_UPPER" >> $GITHUB_OUTPUT - echo "systemd_unit_name=AGEBD-SERVICE-${SERVICE_NAME_UPPER}.service" >> $GITHUB_OUTPUT - echo "service_dir=/sls/bd/hla/${{ inputs.environment }}/services/${SERVICE_NAME_LOWER}/current" >> $GITHUB_OUTPUT - - - name: Ensure service directory exists - run: | - mkdir -p ${{ steps.vars.outputs.service_dir }} - - - name: Sync service deployment files - run: | - rsync -avz --delete --exclude='.venv' \ - ./services/${{ steps.vars.outputs.service_name_lower }}/current/ \ - ${{ steps.vars.outputs.service_dir }}/ - - - name: Substitute environment variables & setup systemd service - run: | - SERVICE_DIR="${{ steps.vars.outputs.service_dir }}" - SYSTEMD_UNIT_NAME="${{ steps.vars.outputs.systemd_unit_name }}" - AGEBD_ENV="${{ inputs.environment }}" - - SYSTEMD_UNIT_FILE_PATH="${SERVICE_DIR}/systemd/${SYSTEMD_UNIT_NAME}" - if [ -f "\$SYSTEMD_UNIT_FILE_PATH" ]; then - sed -i "s/{{ *agebd_env *}}/${AGEBD_ENV}/g" "\$SYSTEMD_UNIT_FILE_PATH" - fi - - mkdir -p ~/.config/systemd/user - ln -sf "\$SYSTEMD_UNIT_FILE_PATH" "~/.config/systemd/user/${SYSTEMD_UNIT_NAME}" - - export XDG_RUNTIME_DIR="/run/user/\$(id -u)" - systemctl --user daemon-reload - systemctl --user enable "${SYSTEMD_UNIT_NAME}" - systemctl --user restart "${SYSTEMD_UNIT_NAME}" diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index ecf4335..73a7cef 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -107,9 +107,5 @@ jobs: # 3. Loop through changed services and invoke deployment script echo "$CHANGED_SERVICES" | while read -r SERVICE; do - echo "==========================================" - echo "Deploying service: ${SERVICE} (${AGEBD_ENV})" - echo "==========================================" - - ./.gitea/scripts/deploy-service.sh "${SERVICE}" "${AGEBD_ENV}" + ./.gitea/scripts/deploy-and-restart-service.sh "${SERVICE}" "${AGEBD_ENV}" done -- 2.54.0 From 59d108f7b3aabbf7f01fdd6a85719703add3c80f Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 13:32:03 +0200 Subject: [PATCH 34/34] fix: remove current branch as trigger --- .gitea/workflows/deploy.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 73a7cef..dae043b 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -4,8 +4,6 @@ on: push: branches: - main - # TODO: remove - - chore/migrate-ansible-logic-to-workflow-steps tags: - 'prod' - 'v*' -- 2.54.0