From 92c832f23335332597f71a341cce9cf6f0192ef9 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sun, 2 May 2021 10:35:28 -0700 Subject: [PATCH 01/21] CI: add Windows to the CI matrix This adds the CI support for the Windows platform. Although this may successfully build in CI, some changes are going to be needed beyond getting it to build. Those are already in review. --- .github/workflows/ci.yml | 51 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 13080c74..5a843d52 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,6 +91,57 @@ jobs: - name: Build and Test run: swift test -c release --enable-test-discovery + windows: + runs-on: windows-latest + + steps: + - uses: actions/checkout@v2 + - uses: seanmiddleditch/gha-setup-vsdevenv@master + - uses: actions/cache@v2 + with: + path: .build + key: ${{ runner.os }}-spm-swift-5.4-${{ hashFiles('**/Package.resolved') }} + restore-keys: | + ${{ runner.os }}-spm-swift-5.4- + + # TODO(compnerd) figure out how to build libxml2 + - name: Fetch libxml2 + run: | + Invoke-WebRequest -Uri "https://artprodeus21.artifacts.visualstudio.com/A8fd008a0-56bc-482c-ba46-67f9425510be/3133d6ab-80a8-4996-ac4f-03df25cd3224/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2NvbXBuZXJkL3Byb2plY3RJZC8zMTMzZDZhYi04MGE4LTQ5OTYtYWM0Zi0wM2RmMjVjZDMyMjQvYnVpbGRJZC8zNTI5NS9hcnRpZmFjdE5hbWUveG1sMi13aW5kb3dzLXg2NA2/content?format=zip" -OutFile $env:Temp\xml-windows-x64.zip + Expand-Archive -Path $env:Temp\xml-windows-x64.zip -DestinationPath $env:Temp -Force + Move-Item -Path $env:Temp\xml2-windows-x64\Library -Destination C:\ -Force + # TODO(compnerd) figure out how to build graphviz + - name: Fetch graphviz + run: | + Invoke-WebRequest -Uri "https://artprodeus21.artifacts.visualstudio.com/A8fd008a0-56bc-482c-ba46-67f9425510be/3133d6ab-80a8-4996-ac4f-03df25cd3224/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2NvbXBuZXJkL3Byb2plY3RJZC8zMTMzZDZhYi04MGE4LTQ5OTYtYWM0Zi0wM2RmMjVjZDMyMjQvYnVpbGRJZC81MDQ4NS9hcnRpZmFjdE5hbWUvZ3JhcGh2aXotd2luZG93cy14NjQ1/content?format=zip" -OutFile $env:Temp\graphviz-windows-x64.zip + Expand-Archive -Path $env:Temp\graphviz-windows-x64.zip -Destination $env:Temp -Force + Move-Item -Path $env:Temp\graphviz-windows-x64\Library -Destination C:\ -Force + + - name: Install swift-5.4 + run: | + Install-Binary -Url "https://swift.org/builds/swift-5.4-release/windows10/swift-5.4-RELEASE/swift-5.4-RELEASE-windows10.exe" -Name "installer.exe" -ArgumentList ("-q") + - name: Set Environment Variables + run: | + echo "SDKROOT=C:\Library\Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + echo "DEVELOPER_DIR=C:\Library\Developer" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + - name: Adjust Paths + run: | + echo "C:\Library\Swift-development\bin;C:\Library\icu-67\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + echo "C:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - name: Install Supporting Files + run: | + Copy-Item "$env:SDKROOT\usr\share\ucrt.modulemap" -destination "$env:UniversalCRTSdkDir\Include\$env:UCRTVersion\ucrt\module.modulemap" + Copy-Item "$env:SDKROOT\usr\share\visualc.modulemap" -destination "$env:VCToolsInstallDir\include\module.modulemap" + Copy-Item "$env:SDKROOT\usr\share\visualc.apinotes" -destination "$env:VCToolsInstallDir\include\visualc.apinotes" + Copy-Item "$env:SDKROOT\usr\share\winsdk.modulemap" -destination "$env:UniversalCRTSdkDir\Include\$env:UCRTVersion\um\module.modulemap" + + - name: Add graphviz to PATH + run: | + echo "C:\Library\graphviz-development\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + + - name: Build and Test + run: swift test -c release --enable-test-discovery -Xlinker -LC:\Library\graphviz-development\usr\lib -Xcc -DLIBXML_STATIC -Xcc -IC:\Library\libxml2-development\usr\include -Xcc -IC:\Library\libxml2-development\usr\include\libxml2 -Xlinker -LC:\Library\libxml2-development\usr\lib + validate-assets: runs-on: ubuntu-latest From b48f0f1c7bb7484a4fe9fa2c0d95dac15ecff221 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sun, 2 May 2021 10:42:48 -0700 Subject: [PATCH 02/21] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a843d52..d5c1c0d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -109,13 +109,13 @@ jobs: run: | Invoke-WebRequest -Uri "https://artprodeus21.artifacts.visualstudio.com/A8fd008a0-56bc-482c-ba46-67f9425510be/3133d6ab-80a8-4996-ac4f-03df25cd3224/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2NvbXBuZXJkL3Byb2plY3RJZC8zMTMzZDZhYi04MGE4LTQ5OTYtYWM0Zi0wM2RmMjVjZDMyMjQvYnVpbGRJZC8zNTI5NS9hcnRpZmFjdE5hbWUveG1sMi13aW5kb3dzLXg2NA2/content?format=zip" -OutFile $env:Temp\xml-windows-x64.zip Expand-Archive -Path $env:Temp\xml-windows-x64.zip -DestinationPath $env:Temp -Force - Move-Item -Path $env:Temp\xml2-windows-x64\Library -Destination C:\ -Force + Move-Item -Path $env:Temp\xml2-windows-x64\Library\libxml2-development -Destination C:\Library\ -Force # TODO(compnerd) figure out how to build graphviz - name: Fetch graphviz run: | Invoke-WebRequest -Uri "https://artprodeus21.artifacts.visualstudio.com/A8fd008a0-56bc-482c-ba46-67f9425510be/3133d6ab-80a8-4996-ac4f-03df25cd3224/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2NvbXBuZXJkL3Byb2plY3RJZC8zMTMzZDZhYi04MGE4LTQ5OTYtYWM0Zi0wM2RmMjVjZDMyMjQvYnVpbGRJZC81MDQ4NS9hcnRpZmFjdE5hbWUvZ3JhcGh2aXotd2luZG93cy14NjQ1/content?format=zip" -OutFile $env:Temp\graphviz-windows-x64.zip Expand-Archive -Path $env:Temp\graphviz-windows-x64.zip -Destination $env:Temp -Force - Move-Item -Path $env:Temp\graphviz-windows-x64\Library -Destination C:\ -Force + Move-Item -Path $env:Temp\graphviz-windows-x64\Library\graphviz-development -Destination C:\Library\ -Force - name: Install swift-5.4 run: | From 066aa609b25b6fae9cf388e2ab60e917ad3de3e7 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sun, 2 May 2021 13:41:46 -0700 Subject: [PATCH 03/21] Update ci.yml Bump Swift to 5.5 to get access to `_InternalSwiftSyntaxParser`. --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5c1c0d1..73fa2d9c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -117,9 +117,9 @@ jobs: Expand-Archive -Path $env:Temp\graphviz-windows-x64.zip -Destination $env:Temp -Force Move-Item -Path $env:Temp\graphviz-windows-x64\Library\graphviz-development -Destination C:\Library\ -Force - - name: Install swift-5.4 + - name: Install swift-5.5 run: | - Install-Binary -Url "https://swift.org/builds/swift-5.4-release/windows10/swift-5.4-RELEASE/swift-5.4-RELEASE-windows10.exe" -Name "installer.exe" -ArgumentList ("-q") + Install-Binary -Url "https://swift.org/builds/swift-5.5-branch/windows10/swift-5.5-DEVELOPMENT-SNAPSHOT-2021-04-19-a/swift-5.5-DEVELOPMENT-SNAPSHOT-2021-04-19-a-windows10.exe" -Name "installer.exe" -ArgumentList ("-q") - name: Set Environment Variables run: | echo "SDKROOT=C:\Library\Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append @@ -140,7 +140,7 @@ jobs: echo "C:\Library\graphviz-development\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - name: Build and Test - run: swift test -c release --enable-test-discovery -Xlinker -LC:\Library\graphviz-development\usr\lib -Xcc -DLIBXML_STATIC -Xcc -IC:\Library\libxml2-development\usr\include -Xcc -IC:\Library\libxml2-development\usr\include\libxml2 -Xlinker -LC:\Library\libxml2-development\usr\lib + run: swift test -c release --enable-test-discovery -Xlinker -LC:\Library\graphviz-development\usr\lib -Xcc -DLIBXML_STATIC -Xcc -IC:\Library\libxml2-development\usr\include -Xcc -IC:\Library\libxml2-development\usr\include\libxml2 -Xlinker -LC:\Library\libxml2-development\usr\lib -Xcc -IC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\include -Xlinker -LC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\lib validate-assets: runs-on: ubuntu-latest From 4d6a6df94e1c3a91cea3c2679e92738aac0bf905 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Mon, 3 May 2021 09:59:17 -0700 Subject: [PATCH 04/21] Update ci.yml --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 73fa2d9c..b3fa810f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,9 +100,9 @@ jobs: - uses: actions/cache@v2 with: path: .build - key: ${{ runner.os }}-spm-swift-5.4-${{ hashFiles('**/Package.resolved') }} + key: ${{ runner.os }}-spm-swift-5.5-${{ hashFiles('**/Package.resolved') }} restore-keys: | - ${{ runner.os }}-spm-swift-5.4- + ${{ runner.os }}-spm-swift-5.5- # TODO(compnerd) figure out how to build libxml2 - name: Fetch libxml2 @@ -117,7 +117,7 @@ jobs: Expand-Archive -Path $env:Temp\graphviz-windows-x64.zip -Destination $env:Temp -Force Move-Item -Path $env:Temp\graphviz-windows-x64\Library\graphviz-development -Destination C:\Library\ -Force - - name: Install swift-5.5 + - name: Install swift-5.5 (2021-04-19 SNAPSHOT) run: | Install-Binary -Url "https://swift.org/builds/swift-5.5-branch/windows10/swift-5.5-DEVELOPMENT-SNAPSHOT-2021-04-19-a/swift-5.5-DEVELOPMENT-SNAPSHOT-2021-04-19-a-windows10.exe" -Name "installer.exe" -ArgumentList ("-q") - name: Set Environment Variables From 18f8e48bc7b2ce0725afe891a2b6071cd7e417b8 Mon Sep 17 00:00:00 2001 From: Mattt Date: Wed, 5 May 2021 06:50:34 -0700 Subject: [PATCH 05/21] Add version-specific manifests for Swift 5.5 --- Package@swift-5.5.swift | 77 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 Package@swift-5.5.swift diff --git a/Package@swift-5.5.swift b/Package@swift-5.5.swift new file mode 100644 index 00000000..6d6a14d1 --- /dev/null +++ b/Package@swift-5.5.swift @@ -0,0 +1,77 @@ +// swift-tools-version:5.3 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "swift-doc", + platforms: [ + .macOS(.v11) + ], + products: [ + .executable(name: "swift-doc", targets: ["swift-doc"]), + .library(name: "SwiftDoc", targets: ["SwiftDoc"]) + ], + dependencies: [ + .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .revision("4ae758ab85ed2a5d3e3e8b5050a8ce52179bd102")), + .package(url: "https://github.com/SwiftDocOrg/SwiftSemantics.git", .revision("0.3.1")), + .package(url: "https://github.com/SwiftDocOrg/CommonMark.git", .upToNextMinor(from: "0.5.0")), + .package(url: "https://github.com/SwiftDocOrg/SwiftMarkup.git", .upToNextMinor(from: "0.3.0")), + .package(url: "https://github.com/SwiftDocOrg/GraphViz.git", .upToNextMinor(from: "0.4.1")), + .package(url: "https://github.com/NSHipster/HypertextLiteral.git", .upToNextMinor(from: "0.0.2")), + .package(url: "https://github.com/SwiftDocOrg/Markup.git", .upToNextMinor(from: "0.1.2")), + .package(url: "https://github.com/NSHipster/SwiftSyntaxHighlighter.git", .revision("1.2.2")), + .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "0.3.1")), + .package(url: "https://github.com/apple/swift-log.git", .upToNextMinor(from: "1.4.2")), + .package(name: "LoggingGitHubActions", url: "https://github.com/NSHipster/swift-log-github-actions.git", .upToNextMinor(from: "0.0.1")), + ], + targets: [ + // Targets are the basic building blocks of a package. A target can define a module or a test suite. + // Targets can depend on other targets in this package, and on products in packages which this package depends on. + .target( + name: "swift-doc", + dependencies: [ + .target(name: "SwiftDoc"), + .target(name: "DCOV"), + .product(name: "ArgumentParser", package: "swift-argument-parser"), + .product(name: "SwiftSemantics", package: "SwiftSemantics"), + .product(name: "SwiftMarkup", package: "SwiftMarkup"), + .product(name: "CommonMarkBuilder", package: "CommonMark"), + .product(name: "HypertextLiteral", package: "HypertextLiteral"), + .product(name: "Markup", package: "Markup"), + .product(name: "GraphViz", package: "GraphViz"), + .product(name: "SwiftSyntaxHighlighter", package: "SwiftSyntaxHighlighter"), + .product(name: "Logging", package: "swift-log"), + .product(name: "LoggingGitHubActions", package: "LoggingGitHubActions") + ] + ), + .target( + name: "DCOV", + dependencies: [] + ), + .target( + name: "SwiftDoc", + dependencies: [ + .product(name: "SwiftSyntax", package: "SwiftSyntax"), + .product(name: "SwiftSemantics", package: "SwiftSemantics"), + .product(name: "SwiftMarkup", package: "SwiftMarkup"), + .product(name: "SwiftSyntaxHighlighter", package: "SwiftSyntaxHighlighter") + ] + ), + .testTarget( + name: "SwiftDocTests", + dependencies: [ + .target(name: "SwiftDoc"), + .product(name: "SwiftSyntax", package: "SwiftSyntax"), + .product(name: "SwiftSemantics", package: "SwiftSemantics"), + .product(name: "SwiftMarkup", package: "SwiftMarkup") + ] + ), + .testTarget( + name: "EndToEndTests", + dependencies: [ + .target(name: "swift-doc"), + ] + ), + ] +) From 0c3e87a25ec49fe0c2fb68b5d3f6677cc9f450d1 Mon Sep 17 00:00:00 2001 From: Mattt Date: Wed, 5 May 2021 06:56:02 -0700 Subject: [PATCH 06/21] Update SwiftSyntaxHighlighter dependency --- Package@swift-5.5.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package@swift-5.5.swift b/Package@swift-5.5.swift index 1c4719a6..588e6945 100644 --- a/Package@swift-5.5.swift +++ b/Package@swift-5.5.swift @@ -20,7 +20,7 @@ let package = Package( .package(url: "https://github.com/SwiftDocOrg/GraphViz.git", .upToNextMinor(from: "0.4.1")), .package(url: "https://github.com/NSHipster/HypertextLiteral.git", .upToNextMinor(from: "0.0.2")), .package(url: "https://github.com/SwiftDocOrg/Markup.git", .upToNextMinor(from: "0.1.2")), - .package(url: "https://github.com/NSHipster/SwiftSyntaxHighlighter.git", .revision("1.2.2")), + .package(url: "https://github.com/NSHipster/SwiftSyntaxHighlighter.git", .revision("1.2.3")), .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "0.3.2")), .package(url: "https://github.com/apple/swift-log.git", .upToNextMinor(from: "1.4.2")), .package(name: "LoggingGitHubActions", url: "https://github.com/NSHipster/swift-log-github-actions.git", .upToNextMinor(from: "0.0.1")), From 05250768c3613e20678691ebed49d5f2c395be9a Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Wed, 5 May 2021 07:33:50 -0700 Subject: [PATCH 07/21] Update ci.yml --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b3fa810f..d13f55c3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -139,6 +139,9 @@ jobs: run: | echo "C:\Library\graphviz-development\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - name: DEBUGGING + run: dir C:\Library + - name: Build and Test run: swift test -c release --enable-test-discovery -Xlinker -LC:\Library\graphviz-development\usr\lib -Xcc -DLIBXML_STATIC -Xcc -IC:\Library\libxml2-development\usr\include -Xcc -IC:\Library\libxml2-development\usr\include\libxml2 -Xlinker -LC:\Library\libxml2-development\usr\lib -Xcc -IC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\include -Xlinker -LC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\lib From 9e2cb3a4098be26cb5ca6ebb28b34d45c69a13f9 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Wed, 5 May 2021 08:10:21 -0700 Subject: [PATCH 08/21] Update ci.yml --- .github/workflows/ci.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d13f55c3..0e9ed201 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,19 +103,6 @@ jobs: key: ${{ runner.os }}-spm-swift-5.5-${{ hashFiles('**/Package.resolved') }} restore-keys: | ${{ runner.os }}-spm-swift-5.5- - - # TODO(compnerd) figure out how to build libxml2 - - name: Fetch libxml2 - run: | - Invoke-WebRequest -Uri "https://artprodeus21.artifacts.visualstudio.com/A8fd008a0-56bc-482c-ba46-67f9425510be/3133d6ab-80a8-4996-ac4f-03df25cd3224/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2NvbXBuZXJkL3Byb2plY3RJZC8zMTMzZDZhYi04MGE4LTQ5OTYtYWM0Zi0wM2RmMjVjZDMyMjQvYnVpbGRJZC8zNTI5NS9hcnRpZmFjdE5hbWUveG1sMi13aW5kb3dzLXg2NA2/content?format=zip" -OutFile $env:Temp\xml-windows-x64.zip - Expand-Archive -Path $env:Temp\xml-windows-x64.zip -DestinationPath $env:Temp -Force - Move-Item -Path $env:Temp\xml2-windows-x64\Library\libxml2-development -Destination C:\Library\ -Force - # TODO(compnerd) figure out how to build graphviz - - name: Fetch graphviz - run: | - Invoke-WebRequest -Uri "https://artprodeus21.artifacts.visualstudio.com/A8fd008a0-56bc-482c-ba46-67f9425510be/3133d6ab-80a8-4996-ac4f-03df25cd3224/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2NvbXBuZXJkL3Byb2plY3RJZC8zMTMzZDZhYi04MGE4LTQ5OTYtYWM0Zi0wM2RmMjVjZDMyMjQvYnVpbGRJZC81MDQ4NS9hcnRpZmFjdE5hbWUvZ3JhcGh2aXotd2luZG93cy14NjQ1/content?format=zip" -OutFile $env:Temp\graphviz-windows-x64.zip - Expand-Archive -Path $env:Temp\graphviz-windows-x64.zip -Destination $env:Temp -Force - Move-Item -Path $env:Temp\graphviz-windows-x64\Library\graphviz-development -Destination C:\Library\ -Force - name: Install swift-5.5 (2021-04-19 SNAPSHOT) run: | @@ -135,6 +122,19 @@ jobs: Copy-Item "$env:SDKROOT\usr\share\visualc.apinotes" -destination "$env:VCToolsInstallDir\include\visualc.apinotes" Copy-Item "$env:SDKROOT\usr\share\winsdk.modulemap" -destination "$env:UniversalCRTSdkDir\Include\$env:UCRTVersion\um\module.modulemap" + # TODO(compnerd) figure out how to build libxml2 + - name: Fetch libxml2 + run: | + Invoke-WebRequest -Uri "https://artprodeus21.artifacts.visualstudio.com/A8fd008a0-56bc-482c-ba46-67f9425510be/3133d6ab-80a8-4996-ac4f-03df25cd3224/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2NvbXBuZXJkL3Byb2plY3RJZC8zMTMzZDZhYi04MGE4LTQ5OTYtYWM0Zi0wM2RmMjVjZDMyMjQvYnVpbGRJZC8zNTI5NS9hcnRpZmFjdE5hbWUveG1sMi13aW5kb3dzLXg2NA2/content?format=zip" -OutFile $env:Temp\xml-windows-x64.zip + Expand-Archive -Path $env:Temp\xml-windows-x64.zip -DestinationPath $env:Temp -Force + Move-Item -Path $env:Temp\xml2-windows-x64\Library\libxml2-development -Destination C:\Library\ -Force + # TODO(compnerd) figure out how to build graphviz + - name: Fetch graphviz + run: | + Invoke-WebRequest -Uri "https://artprodeus21.artifacts.visualstudio.com/A8fd008a0-56bc-482c-ba46-67f9425510be/3133d6ab-80a8-4996-ac4f-03df25cd3224/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2NvbXBuZXJkL3Byb2plY3RJZC8zMTMzZDZhYi04MGE4LTQ5OTYtYWM0Zi0wM2RmMjVjZDMyMjQvYnVpbGRJZC81MDQ4NS9hcnRpZmFjdE5hbWUvZ3JhcGh2aXotd2luZG93cy14NjQ1/content?format=zip" -OutFile $env:Temp\graphviz-windows-x64.zip + Expand-Archive -Path $env:Temp\graphviz-windows-x64.zip -Destination $env:Temp -Force + Move-Item -Path $env:Temp\graphviz-windows-x64\Library\graphviz-development -Destination C:\Library\ -Force + - name: Add graphviz to PATH run: | echo "C:\Library\graphviz-development\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append From 0cffb5ce5f57d6fbfa2b69d1f6bb99c85c16d4fd Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Wed, 5 May 2021 09:03:23 -0700 Subject: [PATCH 09/21] Update ci.yml --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e9ed201..29e22545 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -139,9 +139,6 @@ jobs: run: | echo "C:\Library\graphviz-development\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - - name: DEBUGGING - run: dir C:\Library - - name: Build and Test run: swift test -c release --enable-test-discovery -Xlinker -LC:\Library\graphviz-development\usr\lib -Xcc -DLIBXML_STATIC -Xcc -IC:\Library\libxml2-development\usr\include -Xcc -IC:\Library\libxml2-development\usr\include\libxml2 -Xlinker -LC:\Library\libxml2-development\usr\lib -Xcc -IC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\include -Xlinker -LC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\lib From fd57e7cd518590d504ca95319f72d69b46c9126c Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Wed, 5 May 2021 10:35:13 -0700 Subject: [PATCH 10/21] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29e22545..6711e562 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,7 +140,7 @@ jobs: echo "C:\Library\graphviz-development\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - name: Build and Test - run: swift test -c release --enable-test-discovery -Xlinker -LC:\Library\graphviz-development\usr\lib -Xcc -DLIBXML_STATIC -Xcc -IC:\Library\libxml2-development\usr\include -Xcc -IC:\Library\libxml2-development\usr\include\libxml2 -Xlinker -LC:\Library\libxml2-development\usr\lib -Xcc -IC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\include -Xlinker -LC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\lib + run: swift build -c release -Xlinker -LC:\Library\graphviz-development\usr\lib -Xcc -DLIBXML_STATIC -Xcc -IC:\Library\libxml2-development\usr\include -Xcc -IC:\Library\libxml2-development\usr\include\libxml2 -Xlinker -LC:\Library\libxml2-development\usr\lib -Xcc -IC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\include -Xlinker -LC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\lib validate-assets: runs-on: ubuntu-latest From 47591257440f0693be6ad22381514015e69a18a2 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Wed, 5 May 2021 17:29:50 -0700 Subject: [PATCH 11/21] Update Package@swift-5.5.swift --- Package@swift-5.5.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package@swift-5.5.swift b/Package@swift-5.5.swift index 588e6945..e03073fd 100644 --- a/Package@swift-5.5.swift +++ b/Package@swift-5.5.swift @@ -13,7 +13,7 @@ let package = Package( .library(name: "SwiftDoc", targets: ["SwiftDoc"]) ], dependencies: [ - .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .revision("4ae758ab85ed2a5d3e3e8b5050a8ce52179bd102")), + .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .revision("release/5.5")), .package(url: "https://github.com/SwiftDocOrg/SwiftSemantics.git", .revision("0.3.1")), .package(url: "https://github.com/SwiftDocOrg/CommonMark.git", .upToNextMinor(from: "0.5.0")), .package(url: "https://github.com/SwiftDocOrg/SwiftMarkup.git", .upToNextMinor(from: "0.3.0")), From 9d323f927161fbf4839e9210a1f07354eaa63772 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Wed, 5 May 2021 18:12:35 -0700 Subject: [PATCH 12/21] Update Package@swift-5.5.swift --- Package@swift-5.5.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package@swift-5.5.swift b/Package@swift-5.5.swift index e03073fd..588e6945 100644 --- a/Package@swift-5.5.swift +++ b/Package@swift-5.5.swift @@ -13,7 +13,7 @@ let package = Package( .library(name: "SwiftDoc", targets: ["SwiftDoc"]) ], dependencies: [ - .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .revision("release/5.5")), + .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .revision("4ae758ab85ed2a5d3e3e8b5050a8ce52179bd102")), .package(url: "https://github.com/SwiftDocOrg/SwiftSemantics.git", .revision("0.3.1")), .package(url: "https://github.com/SwiftDocOrg/CommonMark.git", .upToNextMinor(from: "0.5.0")), .package(url: "https://github.com/SwiftDocOrg/SwiftMarkup.git", .upToNextMinor(from: "0.3.0")), From 5667196ccd659087bea50f284c0dae8eac309605 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sun, 9 May 2021 18:15:02 -0700 Subject: [PATCH 13/21] Update Package@swift-5.5.swift --- Package@swift-5.5.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package@swift-5.5.swift b/Package@swift-5.5.swift index 588e6945..157cbced 100644 --- a/Package@swift-5.5.swift +++ b/Package@swift-5.5.swift @@ -15,7 +15,7 @@ let package = Package( dependencies: [ .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .revision("4ae758ab85ed2a5d3e3e8b5050a8ce52179bd102")), .package(url: "https://github.com/SwiftDocOrg/SwiftSemantics.git", .revision("0.3.1")), - .package(url: "https://github.com/SwiftDocOrg/CommonMark.git", .upToNextMinor(from: "0.5.0")), + .package(url: "https://github.com/SwiftDocOrg/CommonMark.git", .upToNextMinor(from: "0.5.1")), .package(url: "https://github.com/SwiftDocOrg/SwiftMarkup.git", .upToNextMinor(from: "0.3.0")), .package(url: "https://github.com/SwiftDocOrg/GraphViz.git", .upToNextMinor(from: "0.4.1")), .package(url: "https://github.com/NSHipster/HypertextLiteral.git", .upToNextMinor(from: "0.0.2")), From d224fcec6fc6e77c9294e1ce9920c312cd16f847 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sun, 9 May 2021 20:47:24 -0700 Subject: [PATCH 14/21] Update ci.yml --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6711e562..d318803e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,12 +97,12 @@ jobs: steps: - uses: actions/checkout@v2 - uses: seanmiddleditch/gha-setup-vsdevenv@master - - uses: actions/cache@v2 - with: - path: .build - key: ${{ runner.os }}-spm-swift-5.5-${{ hashFiles('**/Package.resolved') }} - restore-keys: | - ${{ runner.os }}-spm-swift-5.5- + # - uses: actions/cache@v2 + # with: + # path: .build + # key: ${{ runner.os }}-spm-swift-5.5-${{ hashFiles('**/Package.resolved') }} + # restore-keys: | + # ${{ runner.os }}-spm-swift-5.5- - name: Install swift-5.5 (2021-04-19 SNAPSHOT) run: | From e78681b5da1bc52434e7a097b45375d9dd6ef30b Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Mon, 10 May 2021 16:55:09 -0700 Subject: [PATCH 15/21] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d318803e..8b979aab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,7 +140,7 @@ jobs: echo "C:\Library\graphviz-development\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - name: Build and Test - run: swift build -c release -Xlinker -LC:\Library\graphviz-development\usr\lib -Xcc -DLIBXML_STATIC -Xcc -IC:\Library\libxml2-development\usr\include -Xcc -IC:\Library\libxml2-development\usr\include\libxml2 -Xlinker -LC:\Library\libxml2-development\usr\lib -Xcc -IC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\include -Xlinker -LC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\lib + run: swift build -v -c release -Xlinker -LC:\Library\graphviz-development\usr\lib -Xcc -DLIBXML_STATIC -Xcc -IC:\Library\libxml2-development\usr\include -Xcc -IC:\Library\libxml2-development\usr\include\libxml2 -Xlinker -LC:\Library\libxml2-development\usr\lib -Xcc -IC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\include -Xlinker -LC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\lib validate-assets: runs-on: ubuntu-latest From 13ed8f1a54fbd3af030cd615b12afdf1e70c871f Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Mon, 10 May 2021 17:05:27 -0700 Subject: [PATCH 16/21] Update ci.yml --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b979aab..c8c9945c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,7 +140,9 @@ jobs: echo "C:\Library\graphviz-development\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - name: Build and Test - run: swift build -v -c release -Xlinker -LC:\Library\graphviz-development\usr\lib -Xcc -DLIBXML_STATIC -Xcc -IC:\Library\libxml2-development\usr\include -Xcc -IC:\Library\libxml2-development\usr\include\libxml2 -Xlinker -LC:\Library\libxml2-development\usr\lib -Xcc -IC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\include -Xlinker -LC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\lib + run: | + swift package clean + swift build -v -c release -Xlinker -LC:\Library\graphviz-development\usr\lib -Xcc -DLIBXML_STATIC -Xcc -IC:\Library\libxml2-development\usr\include -Xcc -IC:\Library\libxml2-development\usr\include\libxml2 -Xlinker -LC:\Library\libxml2-development\usr\lib -Xcc -IC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\include -Xlinker -LC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\lib validate-assets: runs-on: ubuntu-latest From 8650f933b86be4d51775d5ab047ff39a9d9a8dd8 Mon Sep 17 00:00:00 2001 From: Mattt Date: Thu, 13 May 2021 08:58:09 -0700 Subject: [PATCH 17/21] Update ci.yml Run CI on PR to any branch --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c8c9945c..a22fcb86 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,6 @@ on: push: branches: [master] pull_request: - branches: [master] jobs: macos_big_sur: From cd95537799521f6b0ed33048e112bc61a5cd52c0 Mon Sep 17 00:00:00 2001 From: Mattt Date: Thu, 13 May 2021 09:07:21 -0700 Subject: [PATCH 18/21] Update Package@swift-5.5.swift Pin SwiftSyntaxHighlighter to ~> 1.2.4 --- Package@swift-5.5.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package@swift-5.5.swift b/Package@swift-5.5.swift index 79c2b413..1494d50b 100644 --- a/Package@swift-5.5.swift +++ b/Package@swift-5.5.swift @@ -20,7 +20,7 @@ let package = Package( .package(url: "https://github.com/SwiftDocOrg/GraphViz.git", .upToNextMinor(from: "0.4.1")), .package(url: "https://github.com/NSHipster/HypertextLiteral.git", .upToNextMinor(from: "0.0.2")), .package(url: "https://github.com/SwiftDocOrg/Markup.git", .upToNextMinor(from: "0.1.2")), - .package(url: "https://github.com/NSHipster/SwiftSyntaxHighlighter.git", .revision("1.2.3")), + .package(url: "https://github.com/NSHipster/SwiftSyntaxHighlighter.git", .upToNextMinor(from: "1.2.4")), .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "0.3.2")), .package(url: "https://github.com/apple/swift-log.git", .upToNextMinor(from: "1.4.2")), .package(name: "LoggingGitHubActions", url: "https://github.com/NSHipster/swift-log-github-actions.git", .upToNextMinor(from: "0.0.1")), From 85eff879ba7f97682385deb8b7ae853049c59144 Mon Sep 17 00:00:00 2001 From: Mattt Date: Thu, 13 May 2021 09:21:17 -0700 Subject: [PATCH 19/21] Update Package@swift-5.5.swift Specify revisions for SwiftSemantics and SwiftSyntaxHighlighter --- Package@swift-5.5.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package@swift-5.5.swift b/Package@swift-5.5.swift index 1494d50b..d13231a8 100644 --- a/Package@swift-5.5.swift +++ b/Package@swift-5.5.swift @@ -14,13 +14,13 @@ let package = Package( ], dependencies: [ .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .revision("release/5.5")), - .package(url: "https://github.com/SwiftDocOrg/SwiftSemantics.git", .upToNextMinor(from: "0.3.2")), + .package(url: "https://github.com/SwiftDocOrg/SwiftSemantics.git", .revision("0.3.2")), .package(url: "https://github.com/SwiftDocOrg/CommonMark.git", .upToNextMinor(from: "0.5.1")), .package(url: "https://github.com/SwiftDocOrg/SwiftMarkup.git", .upToNextMinor(from: "0.3.0")), .package(url: "https://github.com/SwiftDocOrg/GraphViz.git", .upToNextMinor(from: "0.4.1")), .package(url: "https://github.com/NSHipster/HypertextLiteral.git", .upToNextMinor(from: "0.0.2")), .package(url: "https://github.com/SwiftDocOrg/Markup.git", .upToNextMinor(from: "0.1.2")), - .package(url: "https://github.com/NSHipster/SwiftSyntaxHighlighter.git", .upToNextMinor(from: "1.2.4")), + .package(url: "https://github.com/NSHipster/SwiftSyntaxHighlighter.git", .revision("1.2.4")), .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "0.3.2")), .package(url: "https://github.com/apple/swift-log.git", .upToNextMinor(from: "1.4.2")), .package(name: "LoggingGitHubActions", url: "https://github.com/NSHipster/swift-log-github-actions.git", .upToNextMinor(from: "0.0.1")), From a0f0b9b860648fd17dc834f342c5f514c5b2518d Mon Sep 17 00:00:00 2001 From: Mattt Date: Thu, 13 May 2021 10:06:20 -0700 Subject: [PATCH 20/21] Update ci.yml Set name for windows job --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a22fcb86..83f35282 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,6 +93,8 @@ jobs: windows: runs-on: windows-latest + name: "Windows (Swift 5.5)" + steps: - uses: actions/checkout@v2 - uses: seanmiddleditch/gha-setup-vsdevenv@master From c5ddfdecbb0ca5b6b15753319ba8a88a826d3fa1 Mon Sep 17 00:00:00 2001 From: Mattt Date: Thu, 13 May 2021 10:46:20 -0700 Subject: [PATCH 21/21] Update ci.yml Remove swift clean --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 83f35282..427ea967 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -142,7 +142,6 @@ jobs: - name: Build and Test run: | - swift package clean swift build -v -c release -Xlinker -LC:\Library\graphviz-development\usr\lib -Xcc -DLIBXML_STATIC -Xcc -IC:\Library\libxml2-development\usr\include -Xcc -IC:\Library\libxml2-development\usr\include\libxml2 -Xlinker -LC:\Library\libxml2-development\usr\lib -Xcc -IC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\include -Xlinker -LC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\lib validate-assets: