diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cd48b91..18eeaba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,18 +12,7 @@ publish: - npm ci # Verify that the commits are good. - - npx commitlint --from=master to=CI_BUILD_REF_NAME - - # Corda is a non-free font that we use for the books. It was - # picked before Source Serif Pro was created and will continue to - # be used until SSP can handle proper italics. To get around this, - # we stored it in a secret location that Gitlab CI knows about but - # everyone else does not. - - wget $CORDA_FONTS_URL/$CORDA_FONTS_BZ2BALL - - tar -xjf $CORDA_FONTS_BZ2BALL - - mkdir -p ~/.fonts/ - - mv *.otf ~/.fonts/ - - fc-cache -rf + - npx commitlint --from=$CI_BUILD_BEFORE_SHA # We need the covers and the previous version so we can generate the # "previously" chapter. diff --git a/package.json b/package.json index 2fceb83..3f1b477 100644 --- a/package.json +++ b/package.json @@ -15,34 +15,34 @@ }, "homepage": "https://fedran.com/sand-and-bone/", "scripts": { - "build:epub": "mfgames-writing-format build epub", "build:pdf": "mfgames-writing-format build pdf", - "build": "npm run build:epub && npm run build:mobi && npm run build:pdf && npm run build:html && npm run build:docx", - "build:html": "mfgames-writing-format build html", + "build:epub": "mfgames-writing-format build epub", + "build": "npm run build:epub && npm run build:mobi && npm run build:pdf", + "build:extended": "npm run build && npm run build:html && npm run build:docx", "build:docx": "sed 's@­@@g' < dmoonfire-$npm_package_fedran_pov-$npm_package_fedran_vol-$npm_package_name-$npm_package_version.html | pandoc -f html -t docx -o dmoonfire-$npm_package_fedran_pov-$npm_package_fedran_vol-$npm_package_name-$npm_package_version.docx", "build:mobi": "kindlegen dmoonfire-$npm_package_fedran_pov-$npm_package_fedran_vol-$npm_package_name-$npm_package_version.epub", + "build:html": "mfgames-writing-format build html", "commitmsg": "commitlint -E GIT_PARAMS" }, "dependencies": { "@fedran/writing-hyphen": "^1.0.0", - "@fedran/writing-theme": "^1.2.5", + "@fedran/writing-theme": "^2.0.2", "@mfgames-writing/epub2": "^1.1.3", "@mfgames-writing/format": "^2.0.0", "@mfgames-writing/guillemet": "^1.0.0", "@mfgames-writing/html": "^0.1.1", "@mfgames-writing/hyphen": "^0.4.3", - "@mfgames-writing/weasyprint": "^3.0.2", - "url": "^0.11.0" + "@mfgames-writing/weasyprint": "^3.0.2" }, "devDependencies": { - "@commitlint/cli": "^7.0.0", - "@commitlint/config-conventional": "^7.0.1", - "@semantic-release/changelog": "^3.0.0", - "@semantic-release/git": "^7.0.2", + "@commitlint/cli": "^7.5.2", + "@commitlint/config-conventional": "^7.5.0", + "@semantic-release/changelog": "^3.0.2", + "@semantic-release/git": "^7.0.8", "commitizen": "^2.10.1", "cz-conventional-changelog": "^2.1.0", "husky": "^0.14.3", - "semantic-release": "^15.9.9" + "semantic-release": "^15.13.3" }, "release": { "branch": "master",