Remove canvas dependencies

No longer needed after we remove the canvas package (which wasn't being
used in the first place).

Signed-off-by: Mark Yen <mark.yen@suse.com>
This commit is contained in:
Mark Yen
2021-05-06 17:55:24 -07:00
parent 9049e1e861
commit 877aca4a5c
3 changed files with 0 additions and 56 deletions

View File

@@ -14,6 +14,5 @@ jobs:
- uses: actions/setup-node@v2
with:
node-version: '14.x'
- run: sudo apt-get install -y libcairo2-dev libpango1.0-dev libpng-dev libjpeg-dev libgif-dev librsvg2-dev
- run: npm ci
- run: npm run lint:nofix

View File

@@ -26,14 +26,6 @@ jobs:
- uses: actions/setup-python@v2
with:
python-version: '2.x'
- name: Install macOS dependencies
if: startsWith(matrix.os, 'macos-')
run: |
set -o errexit -o nounset
for package in pkg-config cairo pango libpng jpeg giflib librsvg ; do
# Separate 'brew install's because one line fails with an unspecified exit code of 1
brew install "${package}"
done
- name: Install Windows dependencies
if: startsWith(matrix.os, 'windows-')
shell: powershell

View File

@@ -1,7 +1,5 @@
param (
[switch] $SkipVisualStudio,
[switch] $SkipGTK,
[switch] $SkipLibJPEG,
[switch] $SkipTools
)
@@ -42,51 +40,6 @@ if (!$SkipVisualStudio) {
}
}
if (!$SkipGTK) {
Start-Job -Name 'GTK' -ErrorAction Stop -ScriptBlock {
Write-Information 'Downloading GTK...'
$GTKFile = "$ENV:TEMP\gtk.zip"
try {
Invoke-WebRequest -UseBasicParsing -OutFile $GTKFile `
-Uri 'https://download.gnome.org/binaries/win64/gtk+/2.22/gtk%2B-bundle_2.22.1-20101229_win64.zip'
Microsoft.PowerShell.Archive\Expand-Archive -Path $GTKFile -DestinationPath C:\GTK -Force
}
finally {
Remove-Item $GTKFile
}
}
}
if (!$SkipLibJPEG) {
Start-Job -Name 'libjpeg-turbo' -ErrorAction Stop -ScriptBlock {
Write-Information 'Downloading libjpeg-turbo...'
$JPEGFile = "$ENV:TEMP\jpeg-turbo.exe"
if (Test-Path 'C:\libjpeg-turbo64\bin\turbojpeg.dll') {
# libjpeg-turbo is already installed; skip installing it again to avoid
# a dialog box.
Return
}
try {
# SourceForge likes to do the redirect thing, so we need to ask it for the URL
$url = (Invoke-WebRequest -UseBasicParsing `
-Uri 'https://sourceforge.net/settings/mirror_choices?projectname=libjpeg-turbo&filename=2.0.6/libjpeg-turbo-2.0.6-vc64.exe' `
| Select-Object -ExpandProperty Links `
| Where-Object { $_.outerHTML -like '*direct link*' } `
| Select-Object -ExpandProperty href)
Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $JPEGFile
& $JPEGFile /D 'C:\libjpeg-turbo64' /S
}
finally {
Get-Process | Where-Object Path -eq $JPEGFile | Wait-Process
Remove-Item $JPEGFile
}
}
}
if (!$SkipTools) {
Start-Job -Name 'Install Tools' -ErrorAction Stop -ScriptBlock {
Write-Information 'Installing Git, NodeJS & Python 2...'