Merge pull request #579 from phil-opp/azure-artifacts

Migrate from Netlify to Github Pages
2025-12-16 14:27:49 +00:00 · 2019-04-24 18:04:33 +02:00
parent a6b8252946 65f48be964
commit ffb17617a1
24 changed files with 69 additions and 91 deletions
--- 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'
--- 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]
--- 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]
--- 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]
--- 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"
 +++
--- 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]
--- 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]
--- 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]
--- 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"
 +++
--- 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"
 +++
--- 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]
--- 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"
--- 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"
 +++
--- 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"
 +++
--- 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"
 +++

--- 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"
 +++
--- a/blog/static/CNAME
+++ b/blog/static/CNAME
@@ -0,0 +1 @@
+os.phil-opp.com
--- a/blog/static/atom.xml/index.html
+++ b/blog/static/atom.xml/index.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <link rel="canonical" href="/rss.xml" />
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <meta http-equiv="refresh" content="0;url=/rss.xml" />
+    </head>
+</html>
--- a/blog/static/handling-exceptions-with-naked-fns.html
+++ b/blog/static/handling-exceptions-with-naked-fns.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <link rel="canonical" href="/first-edition/extra/naked-exceptions/" />
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <meta http-equiv="refresh" content="0;url=/first-edition/extra/naked-exceptions/" />
+    </head>
+</html>
--- a/blog/templates/redirect-to-frontpage.html
+++ b/blog/templates/redirect-to-frontpage.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <link rel="canonical" href="{{ config.base_url }}" />
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <meta http-equiv="refresh" content="0;url={{ config.base_url }}" />
+    </head>
+</html>
--- a/blog/templates/second-edition/base.html
+++ b/blog/templates/second-edition/base.html
@@ -25,7 +25,7 @@
        <header class="masthead">
            <div style="position:relative">
                <h1 class="masthead-title">
-                    <a href="{{ get_url(path="./second-edition/_index.md") }}" title="Home">{{ config.title }} (Second Edition)</a>
+                    <a href="{{ config.base_url }}" title="Home">{{ config.title }} (Second Edition)</a>
                </h1>
                <p><small>{{ config.extra.subtitle | replace(from=" ", to="&nbsp;")}}</small></p>
                {% block header %}{% endblock header %}
@@ -39,13 +39,8 @@
        <footer class="footer">
            <hr>
            <small>
-                <p>
-                    &copy; <time datetime="2019">2019</time>. All rights reserved.
-                    <a href="{{ get_url(path="./pages/contact.md") }}">Contact</a>
-                </p>
-                <p style = "color: gray;">
-                    Developed on <a href="https://github.com/phil-opp/blog_os">GitHub</a>, built with <a href="https://www.getzola.org/">Zola</a>, </a>hosted on <a href="https://www.netlify.com">Netlify</a>.
-                </p>
+                &copy; <time datetime="2019">2019</time>. All rights reserved.
+                <a href="{{ get_url(path="./pages/contact.md") }}">Contact</a>
            </small>
        </footer>
    </div>
--- 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 %}
-    <aside id="all-posts-link"><a href="{{ get_url(path="./second-edition/_index.md") }}" title="All Posts">« All Posts</a></aside>
+    <aside id="all-posts-link"><a href="{{ config.base_url }}" title="All Posts">« All Posts</a></aside>
 {% endblock header %}

 {% block main %}
--- a/bors.toml
+++ b/bors.toml
@@ -1,4 +1,4 @@
 status = [
-  "deploy/netlify",
+  "phil-opp.blog_os",
 ]
 delete_merged_branches = true
--- a/netlify.toml
+++ b/netlify.toml
@@ -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/"