From 97b7321920d0b4efc083943900dc3612eb41a680 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Thu, 27 Jul 2017 16:46:40 -0400 Subject: [PATCH] Cleaning up Makefile Removing references to and definitions of unused targets --- Makefile | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index bf7e18ee4b..944aea9b5f 100644 --- a/Makefile +++ b/Makefile @@ -78,15 +78,12 @@ UI_RELEASE_FLAG_FILE = awx/ui/.release_built I18N_FLAG_FILE = .i18n_built -.PHONY: clean clean-tmp clean-venv rebase push requirements requirements_dev \ +.PHONY: clean clean-tmp clean-venv requirements requirements_dev \ develop refresh adduser migrate dbchange dbshell runserver celeryd \ receiver test test_unit test_ansible test_coverage coverage_html \ - test_jenkins dev_build release_build release_clean sdist rpmtar mock-rpm \ - mock-srpm rpm-sign deb deb-src debian debsign pbuilder \ - reprepro setup_tarball virtualbox-ovf virtualbox-centos-7 \ - virtualbox-centos-6 clean-bundle setup_bundle_tarball \ + dev_build release_build release_clean sdist \ ui-docker-machine ui-docker ui-release ui-devel \ - ui-test ui-deps ui-test-ci ui-test-saucelabs jlaska VERSION + ui-test ui-deps ui-test-ci ui-test-saucelabs VERSION # remove ui build artifacts clean-ui: @@ -130,14 +127,6 @@ guard-%: exit 1; \ fi -# Fetch from origin, rebase local commits on top of origin commits. -rebase: - git pull --rebase origin master - -# Push changes to origin. -push: - git push origin master - virtualenv: virtualenv_ansible virtualenv_awx virtualenv_ansible: @@ -413,10 +402,6 @@ coverage_html: test_tox: tox -v -# Run unit tests to produce output for Jenkins. -# Alias existing make target so old versions run against Jekins the same way -test_jenkins : test_coverage - # Make fake data DATA_GEN_PRESET = "" bulk_data: