From f12551102948753b13ee6ee7ad2857e85153ceab Mon Sep 17 00:00:00 2001 From: Adrian Mejia Date: Mon, 24 Aug 2020 11:23:42 -0400 Subject: [PATCH 1/5] chore(build): dockerfile --- .vscode/settings.json | 14 -------------- book/config | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 035ef5b2..1405e3d2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,17 +1,3 @@ { - "workbench.colorCustomizations": { - "activityBar.background": "#fbed80", - "activityBar.foreground": "#15202b", - "activityBar.inactiveForeground": "#15202b99", - "activityBarBadge.background": "#06b9a5", - "activityBarBadge.foreground": "#15202b", - "titleBar.activeBackground": "#f9e64f", - "titleBar.inactiveBackground": "#f9e64f99", - "titleBar.activeForeground": "#15202b", - "titleBar.inactiveForeground": "#15202b99", - "statusBar.background": "#f9e64f", - "statusBarItem.hoverBackground": "#f7df1e", - "statusBar.foreground": "#15202b" - }, "peacock.color": "#f9e64f" } diff --git a/book/config b/book/config index f657e9bf..4389b4ad 160000 --- a/book/config +++ b/book/config @@ -1 +1 @@ -Subproject commit f657e9bf4325d4987a30cfc47ad2bbc4bda6b23c +Subproject commit 4389b4adf8c37cba0b40c3d5679da81e0b9838a6 From 738d6f3423a26451766ace84dcfe2e5d12e4dae1 Mon Sep 17 00:00:00 2001 From: Adrian Mejia Date: Mon, 24 Aug 2020 14:56:27 -0400 Subject: [PATCH 2/5] chore(build): add Dockerfile --- Dockerfile | 1 - book/config | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index bb7dbd1b..84cdc3eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,6 @@ RUN bundle -v RUN apt-get update && apt-get install -y \ graphviz \ - cmake bison flex libffi-dev libxml2-dev libgdk-pixbuf2.0-dev libcairo2-dev libpango1.0-dev ttf-lyx \ graphicsmagick-imagemagick-compat graphicsmagick-libmagick-dev-compat RUN cd book/config && bundle install diff --git a/book/config b/book/config index 4389b4ad..1216accf 160000 --- a/book/config +++ b/book/config @@ -1 +1 @@ -Subproject commit 4389b4adf8c37cba0b40c3d5679da81e0b9838a6 +Subproject commit 1216accfbd750b835ba92c196aa20ddd3414c515 From 69f284d913ba5e1f67100e9a8a7764b47c482248 Mon Sep 17 00:00:00 2001 From: Adrian Mejia Date: Mon, 24 Aug 2020 15:05:22 -0400 Subject: [PATCH 3/5] chore(build): use jest config --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 777f62aa..641276ff 100644 --- a/package.json +++ b/package.json @@ -15,10 +15,10 @@ "scripts": { "test": "jest --verbose", "watch": "jest --watch --verbose --coverage", + "ci": "npx eslint src/ && jest --coverage", "coverage": "jest --coverage && open coverage/lcov-report/index.html", "coverage:win": "jest --coverage && cmd.exe /C start coverage/lcov-report/index.html", "lint": "npx eslint --fix --format codeframe src/", - "ci": "npx eslint src/ && jest src/ --coverage", "semantic-release": "semantic-release", "release:check": "semantic-release --dry-run" }, From db10bf733de9fb5baabb5264bc06606420cc464f Mon Sep 17 00:00:00 2001 From: Adrian Mejia Date: Mon, 24 Aug 2020 15:10:18 -0400 Subject: [PATCH 4/5] chore(build): update ruby version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f7c264fa..551c07d9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,7 +52,7 @@ jobs: # a collection of steps docs: docker: - - image: circleci/ruby:2.5.3-stretch-node + - image: circleci/ruby:2.7.1-buster-node environment: NOKOGIRI_USE_SYSTEM_LIBRARIES: true steps: From d3faa71b774a111ad0853c4b0fe52a17209a0175 Mon Sep 17 00:00:00 2001 From: Adrian Mejia Date: Mon, 24 Aug 2020 15:12:44 -0400 Subject: [PATCH 5/5] chore(build): remove deprecated dep --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 551c07d9..b2fcb55b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -84,7 +84,7 @@ jobs: # a collection of steps - run: name: Bundle Install.pre - needed for mathematical -> 'asciidoctor-mathematical' gem - command: sudo apt-get -qq -y install cmake bison flex libffi-dev libxml2-dev libgdk-pixbuf2.0-dev libcairo2-dev libpango1.0-dev ttf-lyx + command: sudo apt-get -qq -y install cmake bison flex libffi-dev libxml2-dev libgdk-pixbuf2.0-dev libcairo2-dev libpango1.0-dev - run: name: Bundle Install.pre - install GraphicsMagick for 'prawn-gmagick' gem