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.

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

build: Loosen up the regex for retrieving the CONSUL_VERSION #5946

Merged
merged 2 commits into from
Jun 11, 2019
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
ui: Fix erroneous variable, and also force an ember cache clean on build
1. We referenced a variable incorrectly here, this fixes that.
2. We also made sure that every `make` target clears ember's `tmp` cache
to ensure that its not using any caches that have since been edited
everytime we call a `make` target.
  • Loading branch information
John Cowen committed Jun 11, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 9d5fb8e61c10c1b56125e8569dc34d15d49e4801
13 changes: 11 additions & 2 deletions ui-v2/GNUmakefile
Original file line number Diff line number Diff line change
@@ -2,7 +2,13 @@ ROOT:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))

all: build

deps: node_modules
deps: node_modules clean

clean:
rm -rf ./tmp

build-ci: deps
yarn run build-ci --output-path=dist

build: deps
yarn run build
@@ -19,6 +25,9 @@ test: deps
test-view: deps
yarn run test:view

test-parallel: deps
yarn test-parallel

lint: deps
yarn run lint:js

@@ -31,4 +40,4 @@ steps:
node_modules: yarn.lock package.json
yarn install

.PHONY: all deps build start test test-view lint format
.PHONY: all deps build start test test-view lint format clean
2 changes: 1 addition & 1 deletion ui-v2/lib/startup/index.js
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ module.exports = {
const vars = {
appName: config.modulePrefix,
environment: config.environment,
rootURL: config.environment === 'production' ? '{{.ContentPath}}' : rootURL,
rootURL: config.environment === 'production' ? '{{.ContentPath}}' : config.rootURL,
config: config,
};
switch (type) {