Commit bee5b82e authored by Ruben ten Hove's avatar Ruben ten Hove
Browse files

Merge branch 'rhtenhove-main-patch-05418' into 'main' 

fix: allow simpler override of web build

See merge request just-ci/templates!172
parents e4181970 d50fe942

.gitlab-ci.yml

+14 −12
Original line number Diff line number Diff line
@@ -130,18 +130,6 @@ jobs:python:custom-image: 
    - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH

      changes: *python_changes



jobs:web:

  stage: test

  trigger:

    include:

      - local: tests/jobs/web.yml

    strategy: depend

  rules:

    - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH

      changes: &web_changes

        - web/**/*

        - tests/**/web.yml



# child pipelines to test our off-the-shelf pipelines

pipelines:c:

  stage: test
@@ -207,3 +195,17 @@ pipelines:rust: 
        - pipelines/container/rust.yml

        - tests/pipelines/rust.yml

        - tests/mockup_projects/rust/**/*



pipelines:web:

  stage: test

  trigger:

    include:

      - local: tests/pipelines/web.yml

    strategy: depend

  rules:

    - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH

      changes: &web_changes

        - web/**/*

        - pipelines/web/**/*

        - tests/pipelines/web.yml

        - tests/mockup_projects/hugo/**/*

pipelines/pages.yml

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
---

include:

  - local: project-automation/badge.yml

  - local: project-automation/pages.yml



badge:pages:

  extends: .badge

  variables:

    NAME: GitLab

    VALUE: Pages

    COLOR: teal

    URL: ${CI_PAGES_URL}

pipelines/web/netlify-hugo.yml

0 → 100644
+16 −0
Original line number Diff line number Diff line 
---

# Requires setting NETLIFY_SITE_ID to the site id of the Netlify Site.



include:

  - local: web/hugo.yml

  - local: web/netlify.yml



netlify:

  script:

    - !reference [.hugo, script]

    - !reference [.netlify, script]



netlify:branch:

  script:

    - !reference [.hugo, script]

    - !reference [.netlify, script]

pipelines/web/pages-hugo.yml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
---

include:

  - local: web/hugo.yml

  - local: web/pages.yml



.pages:

  extends: .hugo

  script:

    - !reference [".hugo", script]

tests/jobs/web.yml

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
---

include:

  - local: web/pages.yml



.hugo:

  variables:

    HUGO_BASEURL: ${CI_PAGES_URL}

    HUGO_DEFAULT_ARGS: "" # minify causes problems with our README

  before_script:

    - cd tests/mockup_projects/pages

    - git clone https://github.com/alexandrevicenzi/soho.git themes/soho

    - mkdir content

    - cp ${CI_PROJECT_DIR}/README.md content/_index.md