Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regenerate static files #151

Merged
merged 1 commit into from
Feb 1, 2024
Merged

Regenerate static files #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# This is a GitHub CODEOWNERS file
# See for more information: https://help.github.com/articles/about-codeowners/

# Global Rule:
* @bbc/rd-apmm-cloudfit
1 change: 0 additions & 1 deletion .github/pull_request_template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ _Where appropriate, if separate to default CI run_
# Submitter PR Checks
_(tick as appropriate)_

- [ ] Added bbc/rd-apmm-cloudfit team as a reviewer
- [ ] PR completes task/fixes bug
- [ ] Tests exercise code appropriately
- [ ] New features and API breaks are flagged in commit messages using magic strings
Expand Down
4 changes: 2 additions & 2 deletions static-commontooling/make/include/core.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ reldir=$(eval reldir := $(shell realpath --relative-to $(project_root_dir) $(top
DEFAULT_PYTHON_VERSION:=3.10
PYTHON_VERSION?=${DEFAULT_PYTHON_VERSION}
ifneq "${PYTHON_VERSION}" "${DEFAULT_PYTHON_VERSION}"
J2CLI_DOCKER_LABEL?=python${PYTHON_VERSION}
CLOUDFIT_BASE_LABEL?=python${PYTHON_VERSION}
else
J2CLI_DOCKER_LABEL?=latest
CLOUDFIT_BASE_LABEL?=latest
endif

J2CLI_DOCKER_LABEL?=latest

# Set python pip config location
ifeq "${GITHUB_ACTIONS}" "true"
PIP_CONFIG_FILE?=$(project_root_dir)/.pip.conf
Expand Down
5 changes: 2 additions & 3 deletions static-commontooling/make/standalone.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
# Change the container image used for processing Jinja templates, such as to one built locally
#
# J2CLI_DOCKER_LABEL?=latest
# Change the label used for the Jinja template container. Note that the default is `latest` unless PYTHON_VERSION
# is set, in which case it defaults to the one corresponding to that Python version.
# Change the label used for the Jinja template container
#
# PBRVERSION_CONTAINER?=public.ecr.aws/o4o2s1w1/cloudfit/pbrversion
# Change the container image used for calculating version numbers, such as to one built locally
Expand All @@ -48,7 +47,7 @@ commontooling_dir?=$(project_root_dir)/commontooling
endif

include $(commontooling_dir)/make/include/core.mk
-include $(project_root_dir)/commontooling/make/include/pull_request_template.mk
-include $(project_root_dir)/commontooling/make/include/github.mk
include $(commontooling_dir)/make/include/gitignore.mk

.PHONY: prepcode
Loading