Merge branch 'master' into 'master'

Adjustments to new infrastructure See merge request !1

Merge branch 'master' into 'master'
Adjustments to new infrastructure See merge request !1
04d7ce8c · Uwe Plonus · aa4517df · bbe89f0a · 04d7ce8c · 04d7ce8c
Commit 04d7ce8c authored Aug 20, 2018 by Uwe Plonus
7 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@
 *.ind
 *.idx
 *.ilg
+public/
+.sass-cache/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
+image: $CI_REGISTRY/sw4j-net/noweb-nasm/master:latest
+
+stages:
+  - build
+  - deploy
+
+pdf:
+  stage: build
+  script:
+    - make
+  artifacts:
+    paths:
+      - biosx86/*.asm
+      - biosx86/*.pdf
+    expire_in: 1 hour
+
+pages:
+  image: $CI_REGISTRY/sw4j-net/jekyll/master:latest
+  stage: deploy
+  script:
+    - gem install jekyll-theme-tactile
+    - jekyll build -s site -d public
+    - mkdir -p public/biosx86
+    - cp biosx86/*.asm public/biosx86/
+    - cp biosx86/*.pdf public/
+  artifacts:
+    paths:
+      - public
+  only:
+    - master
--- a/biosx86/biosx86.nw
+++ b/biosx86/biosx86.nw
 \documentclass[paper=a4]{scrbook}

+\renewcommand{\rm}[0]{\normalfont \rmfamily}
+\renewcommand{\tt}[0]{\normalfont \ttfamily}
+\renewcommand{\it}[0]{\normalfont \itshape}
+\renewcommand{\bf}[0]{\normalfont \bfseries}
+
 \usepackage{fancyvrb}
 \usepackage{noweb}
 \usepackage{xcolor}

--- a/site/_config.yml
+++ b/site/_config.yml
+baseurl: /tutorial-x86
+theme: jekyll-theme-tactile
+# lang:
+title: Emu BIOS
+description: A BIOS for the system emulator
+# show_downloads:
+# zip_url:
+# tar_url:
+
+is_project_page: true
+maintainer: Uwe Plonus
+
+# google_analytics:
--- a/site/_layouts/default.html
+++ b/site/_layouts/default.html
+<!DOCTYPE html>
+<html lang="{{ site.lang | default: "en-US" }}">
+  <head>
+    <meta charset='utf-8'>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <link rel="stylesheet" href="{{ '/assets/css/style.css' | relative_url }}">
+    <link rel="stylesheet" type="text/css" href="{{ '/assets/css/print.css' | relative_url }}" media="print">
+    <!--[if lt IE 9]>
+    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+{% seo %}
+  </head>
+
+  <body>
+    <div id="container">
+      <div class="inner">
+
+        <header>
+          <h1>{{ page.title | default: site.title }}</h1>
+          <h2>{{ page.description | default: site.description }}</h2>
+        </header>
+        <section id="downloads" class="clearfix">
+          {% if site.show_downloads %}
+          <a href="{{ site.zip_url }}" id="download-zip" class="button"><span>Download .zip</span></a>
+          <a href="{{ site.tar_url }}" id="download-tar-gz" class="button"><span>Download .tar.gz</span></a>
+          {% endif %}
+        </section>
+        <hr>
+        <section id="main_content">
+          {{ content }}
+        </section>
+
+        <footer>
+        {% if site.is_project_page %}
+          {{ site.title }} is maintained by {{ site.maintainer }}<br>
+        {% endif %}
+        </footer>
+
+      </div>
+    </div>
+
+    {% if site.google_analytics %}
+      <script>
+        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+        ga('create', '{{ site.google_analytics }}', 'auto');
+        ga('send', 'pageview');
+      </script>
+    {% endif %}
+  </body>
+</html>
--- a/site/assets/css/style.scss
+++ b/site/assets/css/style.scss
+---
+---
+@import "{{ site.theme }}";
+
+code {
+  font-family: monospace;
+}
--- a/site/index.md
+++ b/site/index.md
+---
+layout: default
+---
+# Introduction
+
+This project is a BIOS for the [system emulator](https://git.sw4j.net/osdevelopment-info/sys-emu).