diff options
| author | Jesse Wattenbarger <jwattenb@redhat.com> | 2023-04-20 21:43:31 +0200 |
|---|---|---|
| committer | Jesse Wattenbarger <jwattenb@redhat.com> | 2023-04-21 15:50:05 +0200 |
| commit | 765487390f48e03c5e118e86cc389a737693d1cc (patch) | |
| tree | 09ff61ce3a3c7b606354ccb1a3ad8f11fb818c7e /tools | |
| parent | Avoid recursive include of DEFAULT_SETTINGS, add sanity test (#13236) (diff) | |
| download | awx-765487390f48e03c5e118e86cc389a737693d1cc.tar.xz awx-765487390f48e03c5e118e86cc389a737693d1cc.zip | |
Fallback on PYTHON path in Makefile
- Change default PYTHON in Makefile to be ranked choice
- Fix `PYTHON_VERSION` target that expects just a word
- Use native GNU Make `$(subst ,,)` instead of `sed`
- Add 'version-for-buildyml' target to simplify ci
If I understand correctly, this change should make
'$(PYTHON)' work how we want it to everywhere. Before
this change, on develpers' machines that don't have
a 'python3.9' in their path, make would fail. With this
change, we will prefer python3.9 if it's available, but
we'll take python3 otherwise.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ansible/build.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/ansible/build.yml b/tools/ansible/build.yml index 3ac9004944..9270d69f58 100644 --- a/tools/ansible/build.yml +++ b/tools/ansible/build.yml @@ -4,8 +4,7 @@ gather_facts: true tasks: - name: Get version from SCM if not explicitly provided - shell: | - make print-VERSION | cut -d + -f -1 + command: make version-for-buildyml args: chdir: '../../' register: scm_version |