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

Downgrade pkg to v4.3.x to fix segfault in the standalone build for Windows #112

Merged
merged 5 commits into from
Jun 27, 2019
Merged

Downgrade pkg to v4.3.x to fix segfault in the standalone build for Windows #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
410c113
Downgrade pkg to v4.3.8
yhatt Jun 27, 2019
2f3a56d
Split build job by pkg in CI into pack job
yhatt Jun 27, 2019
b54bad7
Remove CircleCI workflow for debug
yhatt Jun 27, 2019
dc87e82
[ci skip] Update CHANGELOG.md
yhatt Jun 27, 2019
ed396af
Merge branch 'master' into downgrade-pkg
yhatt Jun 27, 2019
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
30 changes: 23 additions & 7 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,11 @@ jobs:
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker push marpteam/marp-cli:latest

release:
pack:
<<: *base
steps:
- checkout

- run:
name: Create release on GitHub
command: curl https://raw.githubusercontent.com/marp-team/marp/master/github-release.js | node

- restore_cache:
keys:
- dependencies-{{ .Environment.CI_CACHE_KEY }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-{{ .Branch }}
Expand All @@ -141,10 +137,27 @@ jobs:
name: Create packages
command: yarn standalone:pack

- persist_to_workspace:
root: dist
paths:
- '*'

- store_artifacts:
path: ./dist
destination: dist

release:
<<: *base
steps:
- checkout

- run:
name: Create release on GitHub
command: curl https://raw.githubusercontent.com/marp-team/marp/master/github-release.js | node

- attach_workspace:
at: dist

- run:
name: Upload created packages to the asset of GitHub release
command: yarn standalone:pack:upload
Expand All @@ -171,10 +184,13 @@ workflows:
filters:
branches:
only: master
- release:
context: github-release
- pack:
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
- release:
context: github-release
requires:
- pack
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [Unreleased]

### Fixed

- Downgrade pkg to v4.3.x to fix segfault in the standalone build for Windows ([#111](https://github.com/marp-team/marp-cli/issues/111), [#112](https://github.com/marp-team/marp-cli/pull/112))

## v0.11.0 - 2019-06-24

### Added
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"jest-junit": "^6.4.0",
"jest-plugin-context": "^2.9.0",
"npm-run-all": "^4.1.5",
"pkg": "^4.4.0",
"pkg": "~4.3.8",
"postcss-url": "^8.0.0",
"prettier": "^1.18.2",
"pug": "^2.0.4",
Expand Down
Loading