diff options
| author | Alan Rominger <arominge@redhat.com> | 2023-02-02 21:27:18 +0100 |
|---|---|---|
| committer | Alan Rominger <arominge@redhat.com> | 2023-02-03 20:24:43 +0100 |
| commit | a949ee048a7b102dd926d22d101c6738b6d8506c (patch) | |
| tree | 8f794e5bf19061110c1d1108cab4b3d2d768d149 /Makefile | |
| parent | Merge pull request #13475 from john-westcott-iv/add_m2m_unit_test (diff) | |
| download | awx-a949ee048a7b102dd926d22d101c6738b6d8506c.tar.xz awx-a949ee048a7b102dd926d22d101c6738b6d8506c.zip | |
Consolidate CI logic with github_ci_runner target
Delete outright the step to install python
Fix typo that failed to label stage
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -65,7 +65,7 @@ I18N_FLAG_FILE = .i18n_built sdist \ ui-release ui-devel \ VERSION PYTHON_VERSION docker-compose-sources \ - .git/hooks/pre-commit + .git/hooks/pre-commit github_ci_setup github_ci_runner clean-tmp: rm -rf tmp/ @@ -301,6 +301,14 @@ test: cd awxkit && $(VENV_BASE)/awx/bin/tox -re py3 awx-manage check_migrations --dry-run --check -n 'missing_migration_file' +github_ci_setup: + echo $(CI_GITHUB_TOKEN) | docker login ghcr.io -u $(GITHUB_ACTOR) --password-stdin # Log in to registry + docker pull $(DEVEL_IMAGE_NAME) || : # Pre-pull image to warm build cache + make docker-compose-build # Build image + +github_ci_runner: github_ci_setup + docker run -u $(shell id -u) --rm -v $(GITHUB_WORKSPACE):/awx_devel/:Z --workdir=/awx_devel $(DEVEL_IMAGE_NAME) $(CI_GITHUB_COMMAND) + test_collection: rm -f $(shell ls -d $(VENV_BASE)/awx/lib/python* | head -n 1)/no-global-site-packages.txt if [ "$(VENV_BASE)" ]; then \ |