Skip to content

PMM-14887 Restructure Makefiles#5212

Draft
ademidoff wants to merge 8 commits intov3from
PMM-14887-restructure-project-makefiles
Draft

PMM-14887 Restructure Makefiles#5212
ademidoff wants to merge 8 commits intov3from
PMM-14887-restructure-project-makefiles

Conversation

@ademidoff
Copy link
Copy Markdown
Member

@ademidoff ademidoff commented Apr 3, 2026

PMM-14887

Link to the Feature Build: SUBMODULES-4291

This pull request introduces several improvements to the development environment, build system, and documentation for PMM Server. The most significant changes include refactoring Makefile usage, updating environment configuration and documentation, and adding new development utilities. These updates aim to streamline local development, clarify configuration, and improve maintainability.

Build system and Makefile refactoring:

  • The main Makefile is now the central entry point for development commands, incorporating targets from .devcontainer/Makefile and removing Makefile.include. This unifies and simplifies build and development workflows. (Makefile [1] .devcontainer/Makefile [2] Makefile.include [3]
  • The .devcontainer/Makefile (formerly Makefile.devcontainer) has been renamed and refactored with more descriptive target names (e.g., psql-managed, dlv-attach) and improved comments. (.devcontainer/Makefile [1] [2]
  • The Dockerfile no longer copies Makefile.devcontainer as Makefile, reflecting the new Makefile structure. (.devcontainer/Dockerfile .devcontainer/DockerfileL17-L18)

Environment configuration and documentation:

  • The .env.example file has been rewritten with clearer variable names and documentation, providing better guidance for local configuration. (.env.example .env.exampleL1-R17)
  • References to the development environment in documentation now point to docker-compose.dev.yml instead of docker-compose.yml, clarifying the intended use of each compose file. (.github/instructions/managed.instructions.md [1] AGENTS.md [2]

Development workflow and CI improvements:

  • The GitHub Actions workflow for unit tests now uses the new PMM Server image location and version, and mounts the correct Makefile for the container. (.github/workflows/managed.yml [1] [2] [3]
  • Unused or outdated environment variables and steps have been cleaned up in workflow files. (.github/workflows/api-tests.yml .github/workflows/api-tests.ymlL70)

New development utilities:

  • New files for MySQL slow query log configuration (dev/my.cnf), log rotation (dev/mysql.logrotate), and sysbench benchmarking (dev/sysbench-ps.sh) have been added to facilitate local testing and performance evaluation. (dev/my.cnf [1] dev/mysql.logrotate [2] dev/sysbench-ps.sh [3]

Minor corrections:

These changes collectively modernize and clarify the development setup, making it easier for contributors to get started and maintain consistency across environments.

@codecov
Copy link
Copy Markdown

codecov bot commented Apr 3, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 47.72%. Comparing base (910cc77) to head (e6f0a28).
⚠️ Report is 2 commits behind head on v3.

Additional details and impacted files
@@            Coverage Diff             @@
##               v3    #5212      +/-   ##
==========================================
- Coverage   47.76%   47.72%   -0.05%     
==========================================
  Files         410      410              
  Lines       41967    41967              
==========================================
- Hits        20047    20030      -17     
- Misses      19943    19954      +11     
- Partials     1977     1983       +6     
Flag Coverage Δ
admin 35.80% <ø> (ø)
agent 53.12% <ø> (-0.13%) ⬇️
managed 47.70% <ø> (-0.02%) ⬇️
vmproxy 72.09% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@catalinaadam catalinaadam temporarily deployed to PMM-14887-restructure-project-makefiles - pmm 3.7.0 PR #5212 April 3, 2026 10:38 — with Render Destroyed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Documentation changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants