Skip to content

Commit f845b4a

Browse files
authored
devops(driver): assemble driver from npm package and Node.js builds (#3322)
1 parent b47ebb3 commit f845b4a

4 files changed

Lines changed: 222 additions & 93 deletions

File tree

build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,13 @@ function download_driver() {
3636
function roll_driver() {
3737
new_driver_version="$1"
3838
upstream_package_version=$(node -e "console.log(require('${upstream_repo_path}/package.json').version)")
39-
echo "Rolling .NET driver to driver ${new_driver_version} and upstream version ${upstream_package_version}..."
39+
new_node_version=$(sed -n 's/^NODE_VERSION="\([^"]*\)".*/\1/p' "${upstream_repo_path}/utils/build/build-playwright-driver.sh")
40+
echo "Rolling .NET driver to driver ${new_driver_version} (Node.js ${new_node_version}) and upstream version ${upstream_package_version}..."
4041

4142
xml_file_path="./src/Common/Version.props"
4243
xml_file_contents=$(cat "${xml_file_path}")
4344
xml_file_contents=$(echo "${xml_file_contents}" | sed "s|<DriverVersion>.*</DriverVersion>|<DriverVersion>${new_driver_version}</DriverVersion>|")
45+
xml_file_contents=$(echo "${xml_file_contents}" | sed "s|<DriverNodeVersion>.*</DriverNodeVersion>|<DriverNodeVersion>${new_node_version}</DriverNodeVersion>|")
4446
echo "${xml_file_contents}" > "${xml_file_path}"
4547

4648
echo "Generating API..."

src/Common/Version.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
<AssemblyVersion>1.60.0</AssemblyVersion>
44
<PackageVersion>$(AssemblyVersion)</PackageVersion>
55
<DriverVersion>1.60.0</DriverVersion>
6+
<!-- The Node.js version bundled with the driver. Kept in sync with NODE_VERSION
7+
in upstream's utils/build/build-playwright-driver.sh by the roll script. -->
8+
<DriverNodeVersion>24.15.0</DriverNodeVersion>
69
<ReleaseVersion>$(AssemblyVersion)</ReleaseVersion>
710
<FileVersion>$(AssemblyVersion)</FileVersion>
811
<NoDefaultExcludes>true</NoDefaultExcludes>

src/Playwright/Playwright.csproj

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,9 @@
4444
</ItemGroup>
4545
<ItemGroup>
4646
<None Remove=".drivers\**" />
47-
<None Include=".drivers\linux\package\**" Link=".playwright\package\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath=".playwright\package" />
48-
<None Include=".drivers\linux\LICENSE" Pack="true" PackagePath=".playwright\node" />
49-
<None Include=".drivers\linux\node" Link=".playwright\node\linux-x64\node" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath=".playwright\node\linux-x64" />
50-
<None Include=".drivers\linux-arm64\node" Link=".playwright\node\linux-arm64\node" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath=".playwright\node\linux-arm64" />
51-
<None Include=".drivers\mac\node" Link=".playwright\node\darwin-x64\node" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath=".playwright\node\darwin-x64" />
52-
<None Include=".drivers\mac-arm64\node" Link=".playwright\node\darwin-arm64\node" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath=".playwright\node\darwin-arm64" />
53-
<None Include=".drivers\win32_x64\node.exe" Link=".playwright\node\win32_x64\node.exe" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath=".playwright\node\win32_x64" />
47+
<!-- The .drivers directory (assembled by Playwright.Tooling) mirrors the .playwright
48+
layout shipped in the package: package/** plus node/<platform>/node binaries. -->
49+
<None Include=".drivers\**" Exclude=".drivers\.stamp" Link=".playwright\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath=".playwright" />
5450
<None Include="build\playwright.ps1" Link="playwright.ps1" CopyToOutputDirectory="PreserveNewest" />
5551
<None Include="build\**" Pack="true" PackagePath="buildTransitive" />
5652
<None Include="build\**" Pack="true" PackagePath="build" />

0 commit comments

Comments
 (0)