diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7c190cce..e323ad5f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,20 +1,11 @@ # Documentation: https://aka.ms/yaml trigger: - batch: true branches: include: - # This is where pull requests from "bors r+" are built. - - staging - # This is where pull requests from "bors try" are built. - - trying - # Build post braches - - post-* - -pr: - branches: + - '*' exclude: - - master + - 'staging.tmp' pool: vmImage: ubuntu-16.04 @@ -27,5 +18,24 @@ steps: displayName: 'Build Info' continueOnError: true -- script: echo "Nothing to do for master branch" - displayName: "Nothing to do" +- bash: curl -sL https://github.com/getzola/zola/releases/download/v0.6.0/zola-v0.6.0-x86_64-unknown-linux-gnu.tar.gz | tar zxv + displayName: "Download Zola" + +- script: python -m pip install --upgrade pip setuptools wheel + displayName: 'Install Python Tools' + +- script: python -m pip install --user PyGithub + displayName: 'Install PyGithub' + +- script: python before_build.py + displayName: "Run before_build.py script" + workingDirectory: "blog" + +- script: ../zola build + displayName: "Build Site" + workingDirectory: "blog" + +- task: PublishPipelineArtifact@0 + inputs: + artifactName: 'generated_site' + targetPath: 'blog/public' diff --git a/blog/content/first-edition/extra/naked-exceptions/01-catching-exceptions/index.md b/blog/content/first-edition/extra/naked-exceptions/01-catching-exceptions/index.md index 228853bc..b45682b9 100644 --- a/blog/content/first-edition/extra/naked-exceptions/01-catching-exceptions/index.md +++ b/blog/content/first-edition/extra/naked-exceptions/01-catching-exceptions/index.md @@ -2,6 +2,7 @@ title = "Catching Exceptions" weight = 1 path = "catching-exceptions" +aliases = ["catching-exceptions.html"] date = 2016-05-28 template = "first-edition/page.html" [extra] diff --git a/blog/content/first-edition/extra/naked-exceptions/02-better-exception-messages/index.md b/blog/content/first-edition/extra/naked-exceptions/02-better-exception-messages/index.md index ff3a8487..08cb3d74 100644 --- a/blog/content/first-edition/extra/naked-exceptions/02-better-exception-messages/index.md +++ b/blog/content/first-edition/extra/naked-exceptions/02-better-exception-messages/index.md @@ -2,6 +2,7 @@ title = "Better Exception Messages" weight = 2 path = "better-exception-messages" +aliases = ["better-exception-messages.html"] date = 2016-08-03 template = "first-edition/page.html" [extra] diff --git a/blog/content/first-edition/extra/naked-exceptions/03-returning-from-exceptions/index.md b/blog/content/first-edition/extra/naked-exceptions/03-returning-from-exceptions/index.md index 84c7e396..921edea5 100644 --- a/blog/content/first-edition/extra/naked-exceptions/03-returning-from-exceptions/index.md +++ b/blog/content/first-edition/extra/naked-exceptions/03-returning-from-exceptions/index.md @@ -2,6 +2,7 @@ title = "Returning from Exceptions" weight = 3 path = "returning-from-exceptions" +aliases = ["returning-from-exceptions.html"] date = 2016-09-21 template = "first-edition/page.html" [extra] diff --git a/blog/content/first-edition/posts/01-multiboot-kernel/index.md b/blog/content/first-edition/posts/01-multiboot-kernel/index.md index acffb81a..87c4af59 100644 --- a/blog/content/first-edition/posts/01-multiboot-kernel/index.md +++ b/blog/content/first-edition/posts/01-multiboot-kernel/index.md @@ -1,7 +1,8 @@ +++ title = "A minimal Multiboot Kernel" weight = 1 -path = "multiboot-kernel/" +path = "multiboot-kernel" +aliases = ["multiboot-kernel.html", "/2015/08/18/multiboot-kernel/", "/rust-os/multiboot-kernel.html"] date = 2015-08-18 template = "first-edition/page.html" +++ diff --git a/blog/content/first-edition/posts/02-entering-longmode/index.md b/blog/content/first-edition/posts/02-entering-longmode/index.md index 3ba27e66..8040fb84 100644 --- a/blog/content/first-edition/posts/02-entering-longmode/index.md +++ b/blog/content/first-edition/posts/02-entering-longmode/index.md @@ -2,6 +2,7 @@ title = "Entering Long Mode" weight = 2 path = "entering-longmode" +aliases = ["entering-longmode.html", "/2015/08/25/entering-longmode/", "/rust-os/entering-longmode.html"] date = 2015-08-25 template = "first-edition/page.html" [extra] diff --git a/blog/content/first-edition/posts/03-set-up-rust/index.md b/blog/content/first-edition/posts/03-set-up-rust/index.md index 3caec2de..769cdbfd 100644 --- a/blog/content/first-edition/posts/03-set-up-rust/index.md +++ b/blog/content/first-edition/posts/03-set-up-rust/index.md @@ -2,6 +2,7 @@ title = "Set Up Rust" weight = 3 path = "set-up-rust" +aliases = ["set-up-rust.html", "setup-rust.html", "/2015/09/02/setup-rust/", "/rust-os/setup-rust.html"] date = 2015-09-02 template = "first-edition/page.html" [extra] diff --git a/blog/content/first-edition/posts/04-printing-to-screen/index.md b/blog/content/first-edition/posts/04-printing-to-screen/index.md index 29325cab..09e78c04 100644 --- a/blog/content/first-edition/posts/04-printing-to-screen/index.md +++ b/blog/content/first-edition/posts/04-printing-to-screen/index.md @@ -2,6 +2,7 @@ title = "Printing to Screen" weight = 4 path = "printing-to-screen" +aliases = ["printing-to-screen.html", "/2015/10/23/printing-to-screen/", "/rust-os/printing-to-screen.html"] date = 2015-10-23 template = "first-edition/page.html" [extra] diff --git a/blog/content/first-edition/posts/05-allocating-frames/index.md b/blog/content/first-edition/posts/05-allocating-frames/index.md index 5bbdb91e..103b2df2 100644 --- a/blog/content/first-edition/posts/05-allocating-frames/index.md +++ b/blog/content/first-edition/posts/05-allocating-frames/index.md @@ -2,6 +2,7 @@ title = "Allocating Frames" weight = 5 path = "allocating-frames" +aliases = ["allocating-frames.html"] date = 2015-11-15 template = "first-edition/page.html" +++ diff --git a/blog/content/first-edition/posts/06-page-tables/index.md b/blog/content/first-edition/posts/06-page-tables/index.md index e97dfb62..2757a4ac 100644 --- a/blog/content/first-edition/posts/06-page-tables/index.md +++ b/blog/content/first-edition/posts/06-page-tables/index.md @@ -2,6 +2,7 @@ title = "Page Tables" weight = 6 path = "page-tables" +aliases = ["page-tables.html", "modifying-page-tables.html"] date = 2015-12-09 template = "first-edition/page.html" +++ diff --git a/blog/content/first-edition/posts/07-remap-the-kernel/index.md b/blog/content/first-edition/posts/07-remap-the-kernel/index.md index e01b2030..5703e865 100644 --- a/blog/content/first-edition/posts/07-remap-the-kernel/index.md +++ b/blog/content/first-edition/posts/07-remap-the-kernel/index.md @@ -2,6 +2,7 @@ title = "Remap the Kernel" weight = 7 path = "remap-the-kernel" +aliases = ["remap-the-kernel.html"] date = 2016-01-01 template = "first-edition/page.html" [extra] diff --git a/blog/content/first-edition/posts/08-kernel-heap/index.md b/blog/content/first-edition/posts/08-kernel-heap/index.md index 5944a4bf..fbdeea44 100644 --- a/blog/content/first-edition/posts/08-kernel-heap/index.md +++ b/blog/content/first-edition/posts/08-kernel-heap/index.md @@ -2,6 +2,7 @@ title = "Kernel Heap" weight = 8 path = "kernel-heap" +aliases = ["kernel-heap.html"] date = 2016-04-11 updated = "2017-11-19" template = "first-edition/page.html" diff --git a/blog/content/first-edition/posts/09-handling-exceptions/index.md b/blog/content/first-edition/posts/09-handling-exceptions/index.md index dece9059..2f934545 100644 --- a/blog/content/first-edition/posts/09-handling-exceptions/index.md +++ b/blog/content/first-edition/posts/09-handling-exceptions/index.md @@ -2,6 +2,7 @@ title = "Handling Exceptions" weight = 9 path = "handling-exceptions" +aliases = ["handling-exceptions.html"] date = 2017-03-26 template = "first-edition/page.html" +++ diff --git a/blog/content/first-edition/posts/10-double-faults/index.md b/blog/content/first-edition/posts/10-double-faults/index.md index 2e13b239..793ab8f8 100644 --- a/blog/content/first-edition/posts/10-double-faults/index.md +++ b/blog/content/first-edition/posts/10-double-faults/index.md @@ -2,6 +2,7 @@ title = "Double Faults" weight = 10 path = "double-faults" +aliases = ["double-faults.html"] date = 2017-01-02 template = "first-edition/page.html" +++ diff --git a/blog/content/news/2018-03-09-pure-rust.md b/blog/content/news/2018-03-09-pure-rust.md index 85798680..e49429ec 100644 --- a/blog/content/news/2018-03-09-pure-rust.md +++ b/blog/content/news/2018-03-09-pure-rust.md @@ -1,6 +1,7 @@ +++ title = "Writing an OS in pure Rust" date = 2018-03-09 +aliases = ["news/2018-03-09-pure-rust"] template = "news-page.html" +++ diff --git a/blog/content/second-edition/_index.md b/blog/content/second-edition/_index.md index 5a157eb1..f7a190b5 100644 --- a/blog/content/second-edition/_index.md +++ b/blog/content/second-edition/_index.md @@ -1,4 +1,4 @@ +++ title = "Second Edition" -template = "second-edition/index.html" +template = "redirect-to-frontpage.html" +++ diff --git a/blog/static/CNAME b/blog/static/CNAME new file mode 100644 index 00000000..3ca438c7 --- /dev/null +++ b/blog/static/CNAME @@ -0,0 +1 @@ +os.phil-opp.com \ No newline at end of file diff --git a/blog/static/atom.xml/index.html b/blog/static/atom.xml/index.html new file mode 100644 index 00000000..f2a8a9e7 --- /dev/null +++ b/blog/static/atom.xml/index.html @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/blog/static/handling-exceptions-with-naked-fns.html b/blog/static/handling-exceptions-with-naked-fns.html new file mode 100644 index 00000000..547db216 --- /dev/null +++ b/blog/static/handling-exceptions-with-naked-fns.html @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/blog/templates/redirect-to-frontpage.html b/blog/templates/redirect-to-frontpage.html new file mode 100644 index 00000000..ddc0d684 --- /dev/null +++ b/blog/templates/redirect-to-frontpage.html @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/blog/templates/second-edition/base.html b/blog/templates/second-edition/base.html index 07f06a16..2a719397 100644 --- a/blog/templates/second-edition/base.html +++ b/blog/templates/second-edition/base.html @@ -25,7 +25,7 @@

- {{ config.title }} (Second Edition) + {{ config.title }} (Second Edition)

{{ config.extra.subtitle | replace(from=" ", to=" ")}}

{% block header %}{% endblock header %} @@ -39,13 +39,8 @@
diff --git a/blog/templates/second-edition/page.html b/blog/templates/second-edition/page.html index 02055d11..f0d368a3 100644 --- a/blog/templates/second-edition/page.html +++ b/blog/templates/second-edition/page.html @@ -4,7 +4,7 @@ {% block title %}{{ page.title }} | {{ config.title }}{% endblock title %} {% block header %} - + {% endblock header %} {% block main %} diff --git a/bors.toml b/bors.toml index caca8be3..fbf1fb00 100644 --- a/bors.toml +++ b/bors.toml @@ -1,4 +1,4 @@ status = [ - "deploy/netlify", + "phil-opp.blog_os", ] delete_merged_branches = true diff --git a/netlify.toml b/netlify.toml deleted file mode 100644 index f9a9c32b..00000000 --- a/netlify.toml +++ /dev/null @@ -1,66 +0,0 @@ -[build] - base = "blog" - publish = "blog/public" - command = "python before_build.py && curl -sL https://github.com/getzola/zola/releases/download/v0.6.0/zola-v0.6.0-x86_64-unknown-linux-gnu.tar.gz | tar zxv && ./zola build" - -[build.environment] - ZOLA_VERSION = "0.5.1" - -[context.deploy-preview] - command = "python before_build.py && curl -sL https://github.com/getzola/zola/releases/download/v0.6.0/zola-v0.6.0-x86_64-unknown-linux-gnu.tar.gz | tar zxv && ./zola build --base-url $DEPLOY_PRIME_URL" - -[context.branch-deploy] - command = "python before_build.py && curl -sL https://github.com/getzola/zola/releases/download/v0.6.0/zola-v0.6.0-x86_64-unknown-linux-gnu.tar.gz | tar zxv && ./zola build --base-url $DEPLOY_PRIME_URL" - - -[[redirects]] -from = "/second-edition/" -to = "/" - -[[redirects]] -from = "/2015/08/18/multiboot-kernel/" -to = "/multiboot-kernel/" - -[[redirects]] -from = "/rust-os/multiboot-kernel.html" -to = "/multiboot-kernel/" - -[[redirects]] -from = "/2015/08/25/entering-longmode/" -to = "/entering-longmode/" - -[[redirects]] -from = "/rust-os/entering-longmode.html" -to = "/entering-longmode/" - -[[redirects]] -from = "/2015/09/02/setup-rust/" -to = "/set-up-rust/" - -[[redirects]] -from = "/setup-rust.html" -to = "/set-up-rust/" - -[[redirects]] -from = "/rust-os/setup-rust.html" -to = "/set-up-rust/" - -[[redirects]] -from = "/2015/10/23/printing-to-screen/" -to = "/printing-to-screen/" - -[[redirects]] -from = "/rust-os/printing-to-screen.html" -to = "/printing-to-screen/" - -[[redirects]] -from = "/atom.xml" -to = "/rss.xml" - -[[redirects]] -from = "/modifying-page-tables.html" -to = "/page-tables/" - -[[redirects]] -from = "/handling-exceptions-with-naked-fns.html" -to = "/extra/naked-exceptions/"