Skip to content

Commit df2247a

Browse files
committed
Update vcpkg and re-add a Linux vcpkg build
1 parent 9ff9939 commit df2247a

3 files changed

Lines changed: 17 additions & 2 deletions

File tree

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ tokio = "0.1.22"
120120

121121
[package.metadata.vcpkg]
122122
git = "https://github.com/microsoft/vcpkg"
123-
rev = "01b29f6d8212bc845da64773b18665d682f5ab66"
123+
rev = "1be5a98d090b1d2beeb63a48ba800fbf006e8aca"
124124

125125
[package.metadata.vcpkg.target]
126126
x86_64-apple-darwin = { install = ["freetype","harfbuzz[icu,graphite2]"] }

dist/azure-build-and-test-vcpkg.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@ steps:
3232
displayName: "Install vcpkg dependencies (macOS)"
3333
condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
3434

35+
- bash: |
36+
set -xeuo pipefail
37+
sudo apt-get update
38+
sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y \
39+
autoconf-archive
40+
displayName: "Install vcpkg dependencies (Ubuntu)"
41+
condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
42+
3543
# Note: setvariable + `set -x` adds spurious single quotes at ends of variable values
3644
- bash: |
3745
echo "##vso[task.setvariable variable=VCPKG_ROOT;]$(pwd)/target/vcpkg"

dist/azure-build-and-test.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,14 @@ parameters:
132132
- name: vcpkgBuilds
133133
type: object
134134
default:
135+
- name: x86_64_unknown_linux_gnu
136+
vmImage: ubuntu-20.04
137+
params:
138+
canaryBuild: true
139+
vars:
140+
TARGET: x86_64-unknown-linux-gnu
141+
TOOLCHAIN: stable
142+
135143
- name: x86_64_apple_darwin
136144
vmImage: macos-11
137145
params: {}
@@ -189,7 +197,6 @@ jobs:
189197
${{ insert }}: ${{ build.vars }}
190198

191199
# vcpkg builds
192-
# TODO: I think Linux/vcpkg is broken: https://github.com/mcgoo/vcpkg-rs/issues/21
193200
- ${{ each build in parameters.vcpkgBuilds }}:
194201
- job: ${{ format('build_{0}_vcpkg', build.name) }}
195202
${{ if eq(build.name, 'x86_64_pc_windows_msvc') }}: # work around timeouts with slow builds

0 commit comments

Comments
 (0)