Skip to content

Commit 52ed893

Browse files
committed
Website: move files into 'public' directory
The website/ directory contains build scripts, test scripts, source files, and generated files. This is a bit messy. Take a first step at organizing website/: move most files into a subdirectory called 'public'. Future commits will pull pieces out of 'public'.
1 parent ecca145 commit 52ed893

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+57
-57
lines changed

.github/workflows/build-and-test-web-demo.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,25 @@ jobs:
3838
- name: C++ build
3939
run: emmake cmake --build build --target quick-lint-js-wasm-demo quick-lint-js-wasm-demo-licenses
4040
- name: C++ install
41-
run: emmake cmake --install build --component wasm-demo --prefix website/demo
41+
run: emmake cmake --install build --component wasm-demo --prefix website/public/demo
4242

4343
- name: JS configure
4444
run: cd website && yarn
4545
- name: JS test
46-
run: cd website && yarn test demo/test-demo.mjs
46+
run: cd website && yarn test public/demo/test-demo.mjs
4747

4848
- name: upload build to workflow
4949
uses: actions/upload-artifact@v2
5050
with:
5151
if-no-files-found: error
5252
name: web-demo-dist-${{ github.sha }}
53-
path: website/demo/dist/
53+
path: website/public/demo/dist/
5454
- name: upload build to long-term storage
5555
if: ${{ github.event_name == 'push' }}
5656
uses: quick-lint/sftp-upload@master
5757
with:
5858
host: ${{ secrets.artifacts_host }}
59-
local-file-globs: website/demo/dist/*
59+
local-file-globs: website/public/demo/dist/*
6060
private-key: ${{ secrets.artifacts_key }}
6161
remote-directory: ${{ secrets.artifacts_root }}/builds/${{ github.sha }}/website-demo/
6262
user: ${{ secrets.artifacts_user }}

.github/workflows/check-error-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: build
2626
run: cmake --build build --config Debug
2727
- name: generate docs
28-
run: ./build/docs/quick-lint-js-generate-error-docs docs/errors/ website/errors/index.template.html website/errors/index.html
28+
run: ./build/docs/quick-lint-js-generate-error-docs docs/errors/ website/public/errors/index.template.html website/public/errors/index.html
2929

3030
# quick-lint-js finds bugs in JavaScript programs.
3131
# Copyright (C) 2020 Matthew Glazar

.github/workflows/deploy-website.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
commit: ${{ github.event.inputs.build_commit_id }}
2525
name: web-demo-dist-${{ github.event.inputs.build_commit_id }}
26-
path: website/demo/dist/
26+
path: website/public/demo/dist/
2727
workflow: build-and-test-web-demo.yml
2828
- name: build site
2929
run: website/prepare-for-publish ./website-build

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ add_subdirectory(plugin/vscode)
3636
add_subdirectory(plugin/emacs)
3737
add_subdirectory(src)
3838
add_subdirectory(tools)
39-
add_subdirectory(website/demo)
39+
add_subdirectory(website/public/demo)
4040
include(CTest)
4141
if (BUILD_TESTING)
4242
add_subdirectory(test)

tools/generate-cli-docs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def main():
3131
"-b",
3232
"html5",
3333
"-D",
34-
"website/",
34+
"website/public/",
3535
"-o",
3636
"cli/index.html",
3737
"docs/cli.adoc",
@@ -80,7 +80,7 @@ def process_man():
8080

8181

8282
def process_html():
83-
file_path = pathlib.Path("website/cli/index.html")
83+
file_path = pathlib.Path("website/public/cli/index.html")
8484
contents = file_path.read_text()
8585

8686
top = """<!-- Copyright (C) 2020 Matthew Glazar -->

website/prepare-for-publish

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -12,62 +12,62 @@ output_directory="$(cd "${output_directory}" && pwd)"
1212

1313
cd "$(dirname "${0}")"
1414

15-
cp atom.svg "${output_directory}/"
16-
cp cli.html "${output_directory}/"
17-
cp debian.svg "${output_directory}/"
18-
cp emacs.svg "${output_directory}/"
19-
cp gnome-terminal.svg "${output_directory}/"
20-
cp hiring.html "${output_directory}/"
21-
cp homebrew.svg "${output_directory}/"
22-
cp index.html "${output_directory}/"
23-
cp install.html "${output_directory}/"
24-
cp license.html "${output_directory}/"
25-
cp linux.svg "${output_directory}/"
26-
cp macos.svg "${output_directory}/"
27-
cp main.css "${output_directory}/"
28-
cp nix.svg "${output_directory}/"
29-
cp notepad-plus-plus.svg "${output_directory}/"
30-
cp npm.svg "${output_directory}/"
31-
cp sublime-text.svg "${output_directory}/"
32-
cp ubuntu.svg "${output_directory}/"
33-
cp vim.gif "${output_directory}/"
34-
cp vscode-demo.mp4 "${output_directory}/"
35-
cp vscode-demo.png "${output_directory}/"
36-
cp vscode-demo.webp "${output_directory}/"
37-
cp vscode.png "${output_directory}/"
38-
cp webstorm.svg "${output_directory}/"
39-
cp windows.svg "${output_directory}/"
15+
cp public/atom.svg "${output_directory}/"
16+
cp public/cli.html "${output_directory}/"
17+
cp public/debian.svg "${output_directory}/"
18+
cp public/emacs.svg "${output_directory}/"
19+
cp public/gnome-terminal.svg "${output_directory}/"
20+
cp public/hiring.html "${output_directory}/"
21+
cp public/homebrew.svg "${output_directory}/"
22+
cp public/index.html "${output_directory}/"
23+
cp public/install.html "${output_directory}/"
24+
cp public/license.html "${output_directory}/"
25+
cp public/linux.svg "${output_directory}/"
26+
cp public/macos.svg "${output_directory}/"
27+
cp public/main.css "${output_directory}/"
28+
cp public/nix.svg "${output_directory}/"
29+
cp public/notepad-plus-plus.svg "${output_directory}/"
30+
cp public/npm.svg "${output_directory}/"
31+
cp public/sublime-text.svg "${output_directory}/"
32+
cp public/ubuntu.svg "${output_directory}/"
33+
cp public/vim.gif "${output_directory}/"
34+
cp public/vscode-demo.mp4 "${output_directory}/"
35+
cp public/vscode-demo.png "${output_directory}/"
36+
cp public/vscode-demo.webp "${output_directory}/"
37+
cp public/vscode.png "${output_directory}/"
38+
cp public/webstorm.svg "${output_directory}/"
39+
cp public/windows.svg "${output_directory}/"
4040

4141
mkdir -p "${output_directory}/demo/"
42-
cp demo/carat.svg "${output_directory}/demo/"
43-
cp demo/editor.mjs "${output_directory}/demo/"
44-
cp demo/index.html "${output_directory}/demo/"
45-
cp demo/quick-lint-js.mjs "${output_directory}/demo/"
42+
cp public/demo/carat.svg "${output_directory}/demo/"
43+
cp public/demo/editor.mjs "${output_directory}/demo/"
44+
cp public/demo/index.html "${output_directory}/demo/"
45+
cp public/demo/quick-lint-js.mjs "${output_directory}/demo/"
4646

4747
mkdir -p "${output_directory}/demo/dist/"
48-
cp demo/dist/copyright.txt "${output_directory}/demo/dist/"
49-
cp demo/dist/quick-lint-js-wasm-demo.js "${output_directory}/demo/dist/"
50-
cp demo/dist/quick-lint-js-wasm-demo.wasm "${output_directory}/demo/dist/"
48+
cp public/demo/dist/copyright.txt "${output_directory}/demo/dist/"
49+
cp public/demo/dist/quick-lint-js-wasm-demo.js "${output_directory}/demo/dist/"
50+
cp public/demo/dist/quick-lint-js-wasm-demo.wasm "${output_directory}/demo/dist/"
5151

5252
mkdir -p "${output_directory}/cli/"
53-
cp cli/index.html "${output_directory}/cli"
53+
cp public/cli/index.html "${output_directory}/cli"
5454

5555
mkdir -p "${output_directory}/benchmarks/"
56-
cp benchmarks/benchmark.css "${output_directory}/benchmarks/"
57-
cp benchmarks/benchmark.mjs "${output_directory}/benchmarks/"
58-
cp benchmarks/index.html "${output_directory}/benchmarks/"
56+
cp public/benchmarks/benchmark.css "${output_directory}/benchmarks/"
57+
cp public/benchmarks/benchmark.mjs "${output_directory}/benchmarks/"
58+
cp public/benchmarks/index.html "${output_directory}/benchmarks/"
5959

6060
mkdir -p "${output_directory}/errors/"
61-
cp errors/index.html "${output_directory}/errors/"
61+
cp public/errors/index.html "${output_directory}/errors/"
6262

6363
mkdir -p "${output_directory}/hiring/"
64-
cp hiring/index.html "${output_directory}/hiring/"
64+
cp public/hiring/index.html "${output_directory}/hiring/"
6565

6666
mkdir -p "${output_directory}/install/"
67-
cp install/index.html "${output_directory}/install/"
67+
cp public/install/index.html "${output_directory}/install/"
6868

6969
mkdir -p "${output_directory}/license/"
70-
cp license/index.html "${output_directory}/license/"
70+
cp public/license/index.html "${output_directory}/license/"
7171

7272
# quick-lint-js finds bugs in JavaScript programs.
7373
# Copyright (C) 2020 Matthew Glazar
File renamed without changes.

0 commit comments

Comments
 (0)