Terms of Service | Privacy Policy | Cookie Policy

Commit 99a333c9 authored by Uwe Plonus's avatar Uwe Plonus
Browse files

Merge branch 'master' into 'master' 

Adjusted image to new structure

See merge request !4
parents 4445c185 23765c1f

.gitlab-ci.yml

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



asm:

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

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

  stage: extract

  script:

    - make source
@@ -15,7 +15,7 @@ asm: 
    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
@@ -25,7 +25,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 source
@@ -38,7 +38,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
@@ -49,10 +49,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/src

    - cp src/*.asm public/src/

site/_config.yml

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

theme: jekyll-theme-tactile-nogh

# lang:

title: Emu BIOS

description: A BIOS for the system emulator