Skip to content

Commit

Permalink
GHA: update SwiftLint packaging for updates to the install layout
Browse files Browse the repository at this point in the history
The MSMs have been migrated as a peer of the platforms and runtimes in
the redistributables.
  • Loading branch information
compnerd committed Feb 23, 2024
1 parent 53117e8 commit f1ce51f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/SwiftLint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
matrix:
include:
- branch: development
tag: DEVELOPMENT-SNAPSHOT-2023-08-12-a
tag: DEVELOPMENT-SNAPSHOT-2024-02-08-a

steps:
# Build
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
- uses: microsoft/[email protected]

- name: package
run: msbuild ${{ github.workspace }}/SourceCache/swift-build/platforms/Windows/SwiftLint.wixproj -nologo -restore -p:Configuration=Release -p:RedistributablesDirectory="${env:SDKROOT}\usr\share\RuntimeMergeModules" -p:SWIFT_LINT_BUILD=${{ github.workspace }}\BinaryCache\SwiftLint\x86_64-unknown-windows-msvc\release -p:OutputPath=${{ github.workspace }}\BinaryCache\artifacts -p:RunWixToolsOutOfProc=true
run: msbuild ${{ github.workspace }}/SourceCache/swift-build/platforms/Windows/SwiftLint.wixproj -nologo -restore -p:Configuration=Release -p:RedistributablesDirectory="${env:SDKROOT}\..\..\..\..\..\..\Redistributables\0.0.0" -p:SWIFT_LINT_BUILD=${{ github.workspace }}\BinaryCache\SwiftLint\x86_64-unknown-windows-msvc\release -p:OutputPath=${{ github.workspace }}\BinaryCache\artifacts -p:RunWixToolsOutOfProc=true

# Release
- run: |
Expand Down
3 changes: 1 addition & 2 deletions platforms/Windows/SwiftLint.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
<Directory Id="INSTALLDIR" Name="SwiftLint">
<Directory Id="_usr" Name="usr">
<Directory Id="_usr_bin" Name="bin">
<!-- TODO(compnerd): this should be `rtl.$(ProductArchitecture).msm` -->
<Merge Id="swift_runtime" Language="0" SourceFile="$(RedistributablesDirectory)\runtime.$(ProductArchitecture).msm" />
<Merge Id="swift_runtime" Language="0" SourceFile="$(RedistributablesDirectory)\rtl.$(ProductArchitecture).msm" />
</Directory>
</Directory>
</Directory>
Expand Down

0 comments on commit f1ce51f

Please sign in to comment.