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

Jump to bottom

make staticrequired shouldn't require all kinds of local installs, fixes #2253 #2254

Merged
merged 3 commits into from
May 15, 2020
Merged

make staticrequired shouldn't require all kinds of local installs, fixes #2253 #2254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a337022
Experimental new build_update.sh
rfay May 14, 2020
0eb97d4
Updated build-tools to v2.4.1
rfay May 14, 2020
8836f19
Move mkdocs and markdownlint into golang container, fixes #2253
rfay May 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 0 additions & 9 deletions .githooks/pre-push.allchecks
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
#!/bin/sh

# markdownlint
markdownlint -o /tmp/mdlint.out *.md docs
if [ "$?" != "0" ]; then
echo "Markdownlint failed on these files:"
awk -F: '{ print $1 }' < "/tmp/mdlint.out" | sort -u
exit 1
fi
set -o errexit

# Look for uncommitted files, http://stackoverflow.com/a/2659808/215713
git diff-index --quiet HEAD || (echo "There are uncommitted files" && exit 1)

Expand Down
8 changes: 6 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,13 @@ packr2:
staticrequired: setup golangci-lint markdownlint mkdocs

markdownlint:
markdownlint *.md docs >/dev/null
@echo "markdownlint: "
@$(DOCKERTESTCMD) \
bash -c "markdownlint *.md docs >/dev/null 2>&1"
mkdocs:
mkdocs build -d /tmp/mkdocsbuild >/dev/null 2>&1
@echo "mkdocs: "
@$(DOCKERTESTCMD) \
bash -c "mkdocs build -d /tmp/mkdocsbuld >/dev/null 2>&1"

darwin_signed: darwin
@if [ -z "$(DDEV_MACOS_SIGNING_PASSWORD)" ] ; then echo "Skipping signing ddev for macOS, no DDEV_MACOS_SIGNING_PASSWORD provided"; else echo "Signing macOS ddev..."; \
Expand Down
0 build-tools/build-tools-VERSION-2.4.0.txt → build-tools/build-tools-VERSION-v2.4.1.txt
View file
Open in desktop
File renamed without changes.
9 changes: 6 additions & 3 deletions build-tools/build_update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@

set -e

base_url=$(curl -s -I https://github.com/drud/build-tools/releases/latest | awk '/^Location/ {gsub(/[\n\r]/,"",$2); printf "%s", $2}')
tag=${base_url##*/}
LATEST_RELEASE=$(curl -L -s -H 'Accept: application/json' https://github.com/drud/build-tools/releases/latest)
# The releases are returned in the format {"id":3622206,"tag_name":"hello-1.0.0.11",...}, we have to extract the tag_name.
LATEST_VERSION=$(echo $LATEST_RELEASE | sed -e 's/.*"tag_name":"\([^"]*\)".*/\1/')
URL="https://github.com/drud/build-tools/releases/download/$LATEST_VERSION"
tag=${LATEST_VERSION}

tarball_url="https://github.com/drud/build-tools/archive/$tag.tar.gz"
internal_name=build-tools-$tag
internal_name=build-tools-${tag#v}
local_file=/tmp/$internal_name.tgz

# If there is a current build-tools, get permission and remove
Expand Down
2 changes: 1 addition & 1 deletion build-tools/makefile_components/base_build_go.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ GOFILES = $(shell find $(SRC_DIRS) -name "*.go")

BUILD_OS = $(shell go env GOHOSTOS)

BUILD_IMAGE ?= drud/golang-build-container:v1.14.0
BUILD_IMAGE ?= drud/golang-build-container:v1.14.2

BUILD_BASE_DIR ?= $(PWD)

Expand Down