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

(internal) Switch from node-static to serve #1831

Merged
merged 1 commit into from
Aug 20, 2020
Merged

(internal) Switch from node-static to serve #1831

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
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ all: depends generate-tests js beautify py package jstest pytest perf
help:
@echo "make <action>"
@echo " all - build both implementations"
@echo " static - serve static version of site locally"
@echo " serve - serve site locally from localhost:8080"
@echo " js - build javascript"
@echo " py - build python"
@echo " alltest - test both implementations, js and python"
Expand All @@ -20,8 +20,8 @@ help:

ci: all git-status-clear

static: js/lib/*.js
@./node_modules/.bin/static -H '{"Cache-Control": "no-cache, must-revalidate"}'
serve: js/lib/*.js
@./node_modules/.bin/serve

js: generate-tests js/lib/*.js
@echo Testing node beautify functionality...
Expand Down Expand Up @@ -155,5 +155,5 @@ clean:
git clean -xfd
#######################################################

.PHONY: all beautify clean depends generate-tests git-status-clear help static update
.PHONY: all beautify clean depends generate-tests git-status-clear help serve update

19 changes: 11 additions & 8 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ jobs:
vmImage: 'ubuntu-latest'
strategy:
matrix:
Python27_Node8:
Python27_Node10:
python.version: '2.7'
node_version: 8.x
Python36_Node10:
python.version: '3.6'
node_version: 10.x
Python37_Node12:
python.version: '3.7'
Python36_Node12:
python.version: '3.6'
node_version: 12.x
Python37_Node13:
python.version: '3.7'
node_version: 13.x
Python38_Node13:
python.version: '3.8'
node_version: 13.x
Expand All @@ -72,12 +72,15 @@ jobs:
vmImage: 'macOS-latest'
strategy:
matrix:
Python27_Node8:
Python27_Node10:
python.version: '2.7'
node_version: 8.x
node_version: 10.x
Python37_Node12:
python.version: '3.7'
node_version: 12.x
Python38_Node13:
python.version: '3.8'
node_version: 13.x
maxParallel: 6

steps:
Expand Down
Loading