Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Use [email protected] for pre-Node.js v10 support - Harfbuzz is now a separate include - libgsf-1 is possibly needed for SVG support? - Embed Windows bundle script in prebuild.yaml - Update canvas-prebuilt docker image version - Make text test assertion more flexible. This broke when the docker image changed. - Temporarily rebuild libjpeg in GNU standard location - Set runpath for copied SOs on Linux - Update from numworks/setup-msys2@v1 to msys2/setup-msys2@v2 - Update from actions/[email protected] to v2 - Use the prebuild/ files from the commit that was used to trigger the prebuild, not the commit of canvas that is being built. See further comments in prebuild.yaml.
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,28 @@ | ||
| # Release procedure: | ||
| # 1. Update the changelog and stage it in git. | ||
| # 2. Run `yarn version --[major|minor|patch]`. (This tags the commit.) | ||
| # 3. Push both the commit and tags to GitHub (`git push --tags Automattic` and | ||
| # `git push Automattic HEAD:master`, where "Automattic" is the remote name | ||
| # for [email protected]:Automattic/node-canvas.git). | ||
| # 4. Create a draft release manually using the GitHub UI for the new tag. | ||
| # 5. Set the `jobs.*.strategy.matrix.node` arrays to the set of Node.js versions | ||
| # to build for. | ||
| # 6. Set the `jobs.*.strategy.matrix.canvas_tag` arrays to the set of Canvas | ||
| # tags to build. (Usually this is a single tag, but can be an array when a | ||
| # new version of Node.js is released and older versions of Canvas need to be | ||
| # built.) | ||
| # 7. Commit this file and push to the `prebuilds` branch. | ||
| # 8. In the Actions tab, navigate to the "Make Prebuilds" workflow and click | ||
| # "Run workflow". Select the `prebuilds` branch so that that branch's | ||
| # prebuild.yaml file is used. | ||
| # 9. Once the builds succeed, promote the draft release to a full release and | ||
| # run npm publish. | ||
|
|
||
| # Note that the files in the prebuild/ directory will be used from the commit | ||
| # that was used to trigger the prebuild workflow. They will not be from the | ||
| # commit/tag that you are building. Because of differences in the provided | ||
| # versions of git, this is achieved in a different way on Linux than on Mac and | ||
| # Win. | ||
|
|
||
| name: Make Prebuilds | ||
| on: workflow_dispatch | ||
|
|
@@ -20,30 +33,54 @@ on: workflow_dispatch | |
| # env: | ||
| # UPLOAD_TO: "v0.0.1" | ||
|
|
||
| # If/when node-canvas moves to Node.js 10+, the latest node-gyp can be used. | ||
|
|
||
| jobs: | ||
| Linux: | ||
| strategy: | ||
| matrix: | ||
| node: [15] | ||
| canvas_tag: ["v2.6.1"] # e.g. "v2.6.1" | ||
| name: ${{ matrix.canvas_tag}}, Node.js ${{ matrix.node }}, Linux | ||
| runs-on: ubuntu-latest | ||
| container: | ||
| image: chearon/canvas-prebuilt:8 | ||
| env: | ||
| CANVAS_VERSION_TO_BUILD: ${{ matrix.canvas_tag }} | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| with: | ||
| ref: ${{ matrix.canvas_tag }} | ||
|
|
||
| # Use the files in the prebuild/ directory from the commit that was used | ||
| # to trigger the prebuild workflow. The version of git that's installed on | ||
| # this Linux here doesn't support the method used on Mac and Win, so we | ||
| # checkout the prebuild branch and copy the files from the prebuild/ | ||
| # directory in the Build step. | ||
| - uses: actions/checkout@v2 | ||
| with: | ||
| ref: ${{ env.GITHUB_SHA }} | ||
| path: prebuild-branch | ||
|
|
||
| - uses: actions/setup-node@v1 | ||
| with: | ||
| node-version: ${{ matrix.node }} | ||
|
|
||
| - name: Reinstall libjpeg in /usr/local | ||
| run: | | ||
| set -ex | ||
| cd /root/libjpeg-* | ||
| cd b | ||
| cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr/local .. | ||
| make | ||
| make install | ||
| - name: Build | ||
| run: | | ||
| set -ex | ||
| mkdir prebuild | ||
| cp -rfv ./prebuild-branch/prebuild/* ./prebuild/ | ||
| npm install -g [email protected] | ||
| npm install --ignore-scripts | ||
| . prebuild/Linux/preinstall.sh | ||
| cp prebuild/Linux/binding.gyp binding.gyp | ||
|
|
@@ -52,20 +89,25 @@ jobs: | |
| - name: Test binary | ||
| run: | | ||
| set -ex | ||
| cd /root/harfbuzz-* && make uninstall | ||
| cd /root/cairo-* && make uninstall | ||
| cd /root/pango-* && cd _build && ninja uninstall | ||
| cd /root/libpng-* && make uninstall | ||
| cd /root/libjpeg-* && cd b && make uninstall | ||
| cd /root/giflib-* && make uninstall | ||
| cd $GITHUB_WORKSPACE | ||
| ls build/Release | ||
| ldd build/Release/canvas.node | ||
| npx mocha test/*.test.js | ||
| - name: Make bundle | ||
| id: make_bundle | ||
| run: . prebuild/tarball.sh | ||
|
|
||
| - name: Upload | ||
| uses: actions/github-script@v2 | ||
| with: | ||
| script: | | ||
| const fs = require("fs"); | ||
|
|
@@ -97,8 +139,8 @@ jobs: | |
| macOS: | ||
| strategy: | ||
| matrix: | ||
| node: [15] | ||
| canvas_tag: ["v2.6.1"] # e.g. "v2.6.1" | ||
| name: ${{ matrix.canvas_tag}}, Node.js ${{ matrix.node }}, macOS | ||
| runs-on: macos-latest | ||
| env: | ||
|
|
@@ -114,7 +156,9 @@ jobs: | |
|
|
||
| - name: Build | ||
| run: | | ||
| git checkout ${{ matrix.canvas_tag }} | ||
| git checkout $GITHUB_SHA -- prebuild/ | ||
| npm install -g [email protected] | ||
| npm install --ignore-scripts | ||
| . prebuild/macOS/preinstall.sh | ||
| cp prebuild/macOS/binding.gyp binding.gyp | ||
|
|
@@ -123,15 +167,15 @@ jobs: | |
| - name: Test binary | ||
| run: | | ||
| brew uninstall --force --ignore-dependencies cairo pango librsvg giflib harfbuzz | ||
| npm test | ||
| - name: Make bundle | ||
| id: make_bundle | ||
| run: . prebuild/tarball.sh | ||
|
|
||
| - name: Upload | ||
| uses: actions/github-script@v2 | ||
| with: | ||
| script: | | ||
| const fs = require("fs"); | ||
|
|
@@ -163,15 +207,18 @@ jobs: | |
| Win: | ||
| strategy: | ||
| matrix: | ||
| node: [15] | ||
| canvas_tag: ["v2.6.1"] # e.g. "v2.6.1" | ||
| name: ${{ matrix.canvas_tag}}, Node.js ${{ matrix.node }}, Windows | ||
| runs-on: windows-latest | ||
| env: | ||
| CANVAS_VERSION_TO_BUILD: ${{ matrix.canvas_tag }} | ||
| steps: | ||
| # GitHub runners now have msys2 installed, but msys is not on the path and | ||
| # is apparently slow to start. | ||
| # https://github.com/msys2/setup-msys2#setup-msys2 | ||
| # https://github.com/actions/virtual-environments/pull/632 | ||
| - uses: msys2/setup-msys2@v2 | ||
| with: | ||
| update: true | ||
| path-type: inherit | ||
|
|
@@ -186,15 +233,31 @@ jobs: | |
|
|
||
| - name: Build | ||
| run: | | ||
| git checkout ${{ matrix.canvas_tag }} | ||
| git checkout $env:GITHUB_SHA -- prebuild/ | ||
| npm install -g [email protected] | ||
| npm install --ignore-scripts | ||
| msys2 -c ". prebuild/Windows/preinstall.sh" | ||
| msys2 -c "cp prebuild/Windows/binding.gyp binding.gyp" | ||
| msys2 -c "node-gyp rebuild -j 2" | ||
| - name: Install Depends | ||
| run: | | ||
| Invoke-WebRequest "http://www.dependencywalker.com/depends22_x64.zip" -OutFile depends22_x64.zip | ||
| 7z e depends22_x64.zip | ||
| - name: Bundle pt 2 | ||
| shell: msys2 {0} | ||
| run: | | ||
| ./depends.exe -c -oc depends.csv build\\Release\\canvas.node || true | ||
| [ -f depends.csv ] || { echo "error invoking depends.exe"; exit 1; } | ||
| copies=$(comm -12 \ | ||
| <(cat depends.csv | cut -d ',' -f2 | sed 's/"//g' | tr '[:upper:]' '[:lower:]' | sort) \ | ||
| <(find /mingw64/bin -name '*.dll' -printf "%f\n" | tr '[:upper:]' '[:lower:]' | sort) \ | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
zbjornson
Author
Collaborator
|
||
| for dll in $copies; do | ||
| cp /mingw64/bin/$dll build/Release | ||
| done; | ||
| - name: Test binary | ||
| # By not running in msys2, this doesn't have access to the msys2 libs | ||
|
|
@@ -203,10 +266,10 @@ jobs: | |
| - name: Make asset | ||
| id: make_bundle | ||
| # I can't figure out why this isn't an env var already. It shows up with `env`. | ||
| run: msys2 -c "UPLOAD_TO=${{ env.UPLOAD_TO }} CANVAS_VERSION_TO_BUILD=${{ env.CANVAS_VERSION_TO_BUILD}} . prebuild/tarball.sh" | ||
|
|
||
| - name: Upload | ||
| uses: actions/github-script@v2 | ||
| with: | ||
| script: | | ||
| const fs = require("fs"); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,11 @@ | ||
| set -ex | ||
|
|
||
| copies=$(lddtree.sh -l build/Release/canvas.node | sed -r -e '/^\/lib/d' -e '/canvas.node$/d'); | ||
|
|
||
| apt install -y patchelf | ||
|
|
||
| for so in $copies; do | ||
| cp $so build/Release | ||
| # Set the run_path for all dependencies. | ||
| patchelf --set-rpath '$ORIGIN' build/Release/$(basename $so) | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
zbjornson
Author
Collaborator
|
||
| done; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Does it need to be inlined? I'd rather keep as much in those scripts as possible. It makes local testing easy.