Terms of Service | Privacy Policy | Cookie Policy

Commit 3d116ab3 authored by Uwe Plonus's avatar Uwe Plonus
Browse files

Merge branch 'master' into 'master' 

Adjusted image to new structure

See merge request !10
parents 28a5753d 6aa8e1be

.gitlab-ci.yml

+6 −6
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ stages: 
  - deploy



src:

  image: $CI_REGISTRY/sw4j-net/noweb/master:latest

  image: $CI_REGISTRY/sw4j-net/noweb:latest

  stage: extract

  script:

    - make -C bootloader src
@@ -16,7 +16,7 @@ src: 
    expire_in: 1 hour



tex:

  image: $CI_REGISTRY/sw4j-net/noweb/master:latest

  image: $CI_REGISTRY/sw4j-net/noweb:latest

  stage: extract

  script:

    - make tex
@@ -28,7 +28,7 @@ tex: 
    expire_in: 1 hour



build:

  image: $CI_REGISTRY/sw4j-net/nasm/master:latest

  image: $CI_REGISTRY/sw4j-net/nasm:latest

  stage: build

  script:

    - make -t -C bootloader src
@@ -41,7 +41,7 @@ build: 
    expire_in: 1 hour



pdf:

  image: $CI_REGISTRY/sw4j-net/noweb/master:latest

  image: $CI_REGISTRY/sw4j-net/noweb:latest

  stage: build

  script:

    - make -t tex
@@ -55,10 +55,10 @@ pdf: 
    expire_in: 1 hour



pages:

  image: $CI_REGISTRY/sw4j-net/jekyll/master:latest

  image: $CI_REGISTRY/sw4j-net/jekyll:latest

  stage: deploy

  script:

    - gem install jekyll-theme-tactile

    - gem install jekyll-theme-tactile-nogh

    - jekyll build -s site -d public

    - mkdir -p public/bootloader

    - cp bootloader/bin/bootloader public/bootloader/

site/_config.yml

+1 −1
Original line number Diff line number Diff line 
theme: jekyll-theme-tactile

theme: jekyll-theme-tactile-nogh

# lang:

title: Tutorial x86

description: A tutorial for the x86 assembly language