Skip to content

Commit

Permalink
Change pre-setup checks
Browse files Browse the repository at this point in the history
  • Loading branch information
martinthomson committed Nov 22, 2024
1 parent ccbe81e commit 9fda1a3
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docker/action/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if [ ! -f Makefile ]; then
echo "Cloning i-d-template into lib for default configuration."
echo "Note: Until setup is complete, the editor's copy will not be updated."
git clone https://github.com/martinthomson/i-d-template lib
echo "PUSH_GHPAGES := false" >Makefile
echo "PRE_SETUP := true" >Makefile
cat lib/template/Makefile >>Makefile
fi

Expand Down
6 changes: 5 additions & 1 deletion ghpages.mk
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ endif
endif
endif

# Default to pushing if a key or token is available.
# Disable pushing if we're not setup and for pull requests.
# Otherwise, enable it if we appear to have credentials.
ifeq (true,$(PRE_SETUP))
PUSH_GHPAGES ?= false
endif
ifeq (pull_request,$(GITHUB_EVENT_NAME))
PUSH_GHPAGES ?= false
endif
Expand Down
6 changes: 5 additions & 1 deletion main.mk
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,14 @@ $(TEST_REPORT):
echo '</testsuite>' >>$@

.PHONY: lint lint-whitespace lint-default-branch lint-docname
lint:: lint-whitespace lint-docname
lint:: lint-whitespace
ifneq (true,$(CI))
lint:: lint-default-branch
endif
ifeq (true,$(PRE_SETUP))
# Disable this check for setup.
lint:: lint-docname
emdif

lint-whitespace::
@err=0; for f in $(drafts_source); do \
Expand Down

0 comments on commit 9fda1a3

Please sign in to comment.