Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings
This repository was archived by the owner on Jun 1, 2023. It is now read-only.

Commit cd0797d

Browse files
authored
Merge branch 'master' into style-callouts
2 parents f7f3609 + 0b9fc74 commit cd0797d

File tree

19 files changed

+4237
-3422
lines changed

19 files changed

+4237
-3422
lines changed

‎.gitattributes‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.node/package-lock.json -diff -merge
22
.node/package-lock.json linguist-generated=true
33

4-
Resources/all.min.css -diff -merge
5-
Resources/all.min.css linguist-generated=true
4+
Sources/swift-doc/Generated/* -diff -merge
5+
Sources/swift-doc/Generated/* linguist-generated=true

‎.github/workflows/ci.yml‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,21 @@ jobs:
9494
windows:
9595
runs-on: windows-latest
9696

97-
name: "Windows (Swift 5.5)"
97+
name: "Windows (Swift ${{ matrix.tag }})"
98+
99+
strategy:
100+
matrix:
101+
include:
102+
- tag: 5.5-DEVELOPMENT-SNAPSHOT-2021年05月09日-a
103+
branch: swift-5.5-branch
98104

99105
steps:
100106
- uses: actions/checkout@v2
101107
- uses: seanmiddleditch/gha-setup-vsdevenv@master
102108

103-
- name: Install swift-5.5 (2021年04月19日 SNAPSHOT)
109+
- name: Install Swift ${{ matrix.tag }}
104110
run: |
105-
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")
111+
Install-Binary -Url "https://swift.org/builds/${{ matrix.branch }}/windows10/swift-${{ matrix.tag }}/swift-${{ matrix.tag }}-windows10.exe" -Name "installer.exe" -ArgumentList ("-q")
106112
- name: Set Environment Variables
107113
run: |
108114
echo "SDKROOT=C:\Library\Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
@@ -126,7 +132,7 @@ jobs:
126132
# TODO(compnerd) figure out how to build graphviz
127133
- name: Fetch graphviz
128134
run: |
129-
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
135+
Invoke-WebRequest -Uri "https://artprodeus21.artifacts.visualstudio.com/A8fd008a0-56bc-482c-ba46-67f9425510be/3133d6ab-80a8-4996-ac4f-03df25cd3224/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2NvbXBuZXJkL3Byb2plY3RJZC8zMTMzZDZhYi04MGE4LTQ5OTYtYWM0Zi0wM2RmMjVjZDMyMjQvYnVpbGRJZC81MTAzNC9hcnRpZmFjdE5hbWUvZ3JhcGh2aXotd2luZG93cy14NjQ1/content?format=zip" -OutFile $env:Temp\graphviz-windows-x64.zip
130136
Expand-Archive -Path $env:Temp\graphviz-windows-x64.zip -Destination $env:Temp -Force
131137
Move-Item -Path $env:Temp\graphviz-windows-x64\Library\graphviz-development -Destination C:\Library\ -Force
132138
- name: Add graphviz to PATH
@@ -136,6 +142,15 @@ jobs:
136142
run: |
137143
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
138144
145+
- name: Package
146+
run: |
147+
msbuild WiX/swift-doc.wixproj -nologo -p:Configuration=Release -p:OutputPath=$PWD\.build\artifacts -p:RunWixToolsOutOfProc=true -p:GRAPHVIZ_ROOT=C:\Library\graphviz-development -p:SWIFT_DOC_BUILD=$PWD\.build\release # -p:ProductVersion=$env:GITHUB_REF.Replace('refs/tags/', '')
148+
149+
- uses: actions/upload-artifact@v2
150+
with:
151+
name: swift-doc.msi
152+
path: .build\artifacts\swift-doc.msi
153+
139154
validate-assets:
140155
runs-on: ubuntu-latest
141156

@@ -161,9 +176,9 @@ jobs:
161176
- name: Test assets
162177
run: |
163178
cd .node
164-
OLD=`cksum ../Resources/all.min.css`
179+
OLD=`cksum ../Sources/swift-doc/Generated/CSS.swift`
165180
npm run build
166-
NEW=`cksum ../Resources/all.min.css`
181+
NEW=`cksum ../Sources/swift-doc/Generated/CSS.swift`
167182
if [[ "$OLD" != "$NEW" ]]; then
168183
echo "Regenerated assets differ from committed version"
169184
exit -1

‎.github/workflows/publish.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,65 @@ jobs:
7676
env:
7777
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
7878

79+
windows_msi:
80+
name: Build swift-doc.msi
81+
runs-on: windows-latest
82+
strategy:
83+
matrix:
84+
include:
85+
- tag: 5.5-DEVELOPMENT-SNAPSHOT-2021年05月09日-a
86+
branch: swift-5.5-branch
87+
steps:
88+
- uses: actions/checkout@v2
89+
- uses: seanmiddleditch/gha-setup-vsdevenv@master
90+
91+
- name: Install Swift ${{ matrix.tag }}
92+
run: |
93+
Install-Binary -Url "https://swift.org/builds/${{ matrix.branch }}/windows10/swift-${{ matrix.tag }}/swift-${{ matrix.tag }}-windows10.exe" -Name "installer.exe" -ArgumentList ("-q")
94+
- name: Set Environment Variables
95+
run: |
96+
echo "SDKROOT=C:\Library\Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
97+
echo "DEVELOPER_DIR=C:\Library\Developer" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
98+
- name: Adjust Paths
99+
run: |
100+
echo "C:\Library\Swift-development\bin;C:\Library\icu-67\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
101+
echo "C:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
102+
- name: Install Supporting Files
103+
run: |
104+
Copy-Item "$env:SDKROOT\usr\share\ucrt.modulemap" -destination "$env:UniversalCRTSdkDir\Include\$env:UCRTVersion\ucrt\module.modulemap"
105+
Copy-Item "$env:SDKROOT\usr\share\visualc.modulemap" -destination "$env:VCToolsInstallDir\include\module.modulemap"
106+
Copy-Item "$env:SDKROOT\usr\share\visualc.apinotes" -destination "$env:VCToolsInstallDir\include\visualc.apinotes"
107+
Copy-Item "$env:SDKROOT\usr\share\winsdk.modulemap" -destination "$env:UniversalCRTSdkDir\Include\$env:UCRTVersion\um\module.modulemap"
108+
109+
- name: Fetch libxml2
110+
run: |
111+
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
112+
Expand-Archive -Path $env:Temp\xml-windows-x64.zip -DestinationPath $env:Temp -Force
113+
Move-Item -Path $env:Temp\xml2-windows-x64\Library\libxml2-development -Destination C:\Library\ -Force
114+
- name: Fetch graphviz
115+
run: |
116+
Invoke-WebRequest -Uri "https://artprodeus21.artifacts.visualstudio.com/A8fd008a0-56bc-482c-ba46-67f9425510be/3133d6ab-80a8-4996-ac4f-03df25cd3224/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2NvbXBuZXJkL3Byb2plY3RJZC8zMTMzZDZhYi04MGE4LTQ5OTYtYWM0Zi0wM2RmMjVjZDMyMjQvYnVpbGRJZC81MTAzNC9hcnRpZmFjdE5hbWUvZ3JhcGh2aXotd2luZG93cy14NjQ1/content?format=zip" -OutFile $env:Temp\graphviz-windows-x64.zip
117+
Expand-Archive -Path $env:Temp\graphviz-windows-x64.zip -Destination $env:Temp -Force
118+
Move-Item -Path $env:Temp\graphviz-windows-x64\Library\graphviz-development -Destination C:\Library\ -Force
119+
120+
- name: Build
121+
run: |
122+
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
123+
124+
- name: Package
125+
run: |
126+
msbuild WiX/swift-doc.wixproj -nologo -p:Configuration=Release -p:OutputPath=$PWD\.build\artifacts -p:RunWixToolsOutOfProc=true -p:GRAPHVIZ_ROOT=C:\Library\graphviz-development -p:SWIFT_DOC_BUILD=$PWD\.build\release -p:ProductVersion=$env:GITHUB_REF.Replace('refs/tags/', '')
127+
128+
- name: Upload the installer to the GitHub release
129+
uses: actions/upload-release-asset@v1.0.1
130+
env:
131+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
132+
with:
133+
upload_url: ${{ github.event.release.upload_url }}
134+
asset_path: .build\artifacts\swift-doc.msi
135+
asset_name: swift-doc.msi
136+
asset_content_type: application/octet-stream
137+
79138
docker:
80139
name: Build and push Docker container
81140

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
xcuserdata/
66
.swiftpm
77

8-
Resources/*.css
9-
!Resources/*.min.css
10-
118
# NodeJS
129
## Logs
1310
logs

‎.node/index.js‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
const fs = require("fs");
2+
const path = require('path');
3+
const postcss = require("postcss");
4+
5+
const source = "../Assets/css/all.css";
6+
const destination = "../Sources/swift-doc/Generated/CSS.swift";
7+
8+
const input = fs.readFileSync(source);
9+
10+
postcss([
11+
require("postcss-preset-env")({
12+
stage: 0,
13+
features: {
14+
"matches-pseudo-class": false,
15+
},
16+
}),
17+
require("cssnano")({
18+
preset: "default",
19+
}),
20+
])
21+
.process(input, { from: source, to: destination })
22+
.then((result) => {
23+
const output = [
24+
`// This file was automatically generated and should not be edited.`,
25+
`let css: String = #"${result.css}"#`,
26+
].join("\n\n") + "\n";
27+
28+
fs.mkdir(path.dirname(destination), () => {
29+
fs.writeFileSync(destination, output);
30+
});
31+
});

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /