Fix format/target handling in CI config to match refactored CaSILE

parent 52ab9102
......@@ -13,13 +13,15 @@ before_script:
- make sync_pre
cache:
untracked: true
.books:
.pdfs:
stage: build
tags:
- casile
script: make ${CI_JOB_NAME}
artifacts:
untracked: true
pdfs:
extends: .pdfs
renderings:
stage: extras
tags:
......
......@@ -14,17 +14,17 @@ INPUTDIR ?= $(OUTPUTDIR)
ORIGLAYOUTS := $(LAYOUTS)
LAYOUTS ?= a5trim-kartonkapakli
FORMATS ?= pdf epub
FORMATS ?= pdfs epub
LAYOUTS_app = uygulama
FORMATS_app = pdf uygulama
FORMATS_app = pdfs app
LAYOUTS_ekran = ekran
FORMATS_ekran = pdf
FORMATS_ekran = pdfs
LAYOUTS_web = $(ORIGLAYOUTS) a4-cikti a4-spiral
FORMATS_web = pdf epub mobi web play
FORMATS_web = pdfs epub mobi web play
LAYOUTS_isbn-basvuru = $(ORIGLAYOUTS)
FORMATS_isbn-basvuru = pdf
FORMATS_isbn-basvuru = pdfs
LAYOUTS_1.basim = $(ORIGLAYOUTS)
FORMATS_1.basim = pdf epub mobi uygulama ekran web play
FORMATS_1.basim = pdfs play
LAYOUTS_2.basim = $(LAYOUTS_1.basim)
FORMATS_2.basim = $(FORMATS_1.basim)
LAYOUTS_3.basim = $(LAYOUTS_2.basim)
......@@ -47,7 +47,7 @@ CITEMPLATE ?= $(AVADANLIKDIR)/gitlab-ci.yml
CICONFIG ?= .gitlab-ci.yml
# Work around GNU make defaulting to running the first rule defined
default: books
default: pdfs
ifeq ($(DEBUG),true)
SILE = /home/caleb/projects/sile/sile
......@@ -169,8 +169,8 @@ time_warp_avadanlik:
# Create per book jobs in the CI config
define ci_setup ?=
yq -M -s -y -e --arg targets "$(TARGETS)" \
'. + ($$targets | [splits(" ") | { (.) : { "extends": ".books", "artifacts": { "paths": ((.) + "*") } }}]) | add'
yq -M -s -y -e --arg sources "$(SOURCES)" \
'. + ($$sources | [splits(" ") | { ((.) + ".pdfs") : { "extends": ".pdfs", "artifacts": { "paths": [((.) + "*")] } }}]) | add'
endef
pre_sync = $(sync_nextcloud)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment