Skip to content

Commit

Permalink
Merge pull request #13896 from jjwatt/jjwatt-pyver
Browse files Browse the repository at this point in the history
Fallback on PYTHON path in Makefile
  • Loading branch information
jjwatt committed Apr 24, 2023
2 parents 0867221 + 7654873 commit 2ce9440
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
16 changes: 14 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-include awx/ui_next/Makefile

PYTHON ?= python3.9
PYTHON := $(notdir $(shell for i in python3.9 python3; do command -v $$i; done|sed 1q))
DOCKER_COMPOSE ?= docker-compose
OFFICIAL ?= no
NODE ?= node
Expand Down Expand Up @@ -606,7 +606,18 @@ VERSION:
@echo "awx: $(VERSION)"

PYTHON_VERSION:
@echo "$(PYTHON)" | sed 's:python::'
@echo "$(subst python,,$(PYTHON))"

.PHONY: version-for-buildyml
version-for-buildyml:
@echo $(firstword $(subst +, ,$(VERSION)))
# version-for-buildyml prints a special version string for build.yml,
# chopping off the sha after the '+' sign.
# tools/ansible/build.yml was doing this: make print-VERSION | cut -d + -f -1
# This does the same thing in native make without
# the pipe or the extra processes, and now the pb does `make version-for-buildyml`
# Example:
# 22.1.1.dev38+g523c0d9781 becomes 22.1.1.dev38

.PHONY: Dockerfile
## Generate Dockerfile for awx image
Expand Down Expand Up @@ -658,6 +669,7 @@ messages:
fi; \
$(PYTHON) manage.py makemessages -l en_us --keep-pot

.PHONY: print-%
print-%:
@echo $($*)

Expand Down
3 changes: 1 addition & 2 deletions tools/ansible/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2ce9440

Please sign in to comment.