commit fa445dafa06c704bf59e434ac2297cecab9e9500
author Marc Kupietz <kupietz@ids-mannheim.de> Sat Mar 16 10:46:22 2024 +0100
committer Marc Kupietz <kupietz@ids-mannheim.de> Sat Mar 16 10:46:22 2024 +0100
tree 9b7afcf60f4b0b1ef89ea3dde8c325d840c1d770
parent 95bce0da29e7a10f038aee75ed26df8a5e7f08bb

Make make and ci more performant

.gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a3d737..cb31ce1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,13 +67,9 @@
     - start_section install_linux_packages "Installing missing Linux packages"
     - mkdir -pv $APT_CACHE_DIR
     - apt-get -o dir::cache::archives="$APT_CACHE_DIR" update
-    - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y npm rsync pv jq curl openjdk-17-jre-headless
+    - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y rsync pv jq curl openjdk-17-jre-headless
     - end_section install_linux_packages
 
-    - start_section install_npm_packages "Installing missing Node packages"
-    - npm install -g 'git+https://gitlab.ids-mannheim.de/KorAP/korap-conllu-cmc.git'
-    - end_section install_npm_packages
-
     - start_section install_perl_packages "Installing missing Perl packages"
     - curl -L https://cpanmin.us | perl - App::cpanminus
     - cpanm -n -l $PERL_LOCAL_LIB_ROOT File::ShareDir::Install https://github.com/KorAP/KorAP-XML-TEI.git

Makefile

diff --git a/Makefile b/Makefile
index d9301ba..c6f6d50 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,8 @@
 
 krill: $(TARGET_DIR)/dnb.krill.tar
 
+KORAPXML2CONLLU ?= java -jar lib/korapxml2conllu.jar
+
 $(TARGET_DIR)/dnb.i5.xml: $(patsubst $(SRC_DIR)/%.epub,$(TARGET_DIR)/%.i5.xml,$(wildcard $(SRC_DIR)/*.epub))
 	head -n -1 xslt/idsCorpus-template.xml > $@
 	cat $^ >> $@
@@ -32,16 +34,16 @@
 	tei2korapxml -l warn -s -tk - < $< > $@
 
 %.tree_tagger.zip: %.zip
-	korapxml2conllu $< | pv | docker run --rm -i korap/conllu2treetagger -l german | conllu2korapxml > $@
+	$(KORAPXML2CONLLU) $< | pv | docker run --rm -i korap/conllu2treetagger -l german | conllu2korapxml > $@
 
 %.spacy.zip: %.zip
-	korapxml2conllu $< | pv | docker run --rm -i korap/conllu2spacy | conllu2korapxml > $@
+	$(KORAPXML2CONLLU) $< | pv | docker run --rm -i korap/conllu2spacy | conllu2korapxml > $@
 
 %.ud.zip: %.zip
-	korapxml2conllu $< | pv | ./scripts/udpipe2 | conllu2korapxml > $@
+	$(KORAPXML2CONLLU) $< | pv | ./scripts/udpipe2 | conllu2korapxml > $@
 
 %.cmc.zip: %.zip
-	korapxml2conllu $< | pv | conllu2cmc -s | conllu2korapxml > $@
+	$(KORAPXML2CONLLU) $< | pv | conllu2cmc -s | conllu2korapxml > $@
 
 %.krill.tar: %.zip
 	mkdir -p $(basename $@)

lib/korapxml2conllu.jar

diff --git a/lib/korapxml2conllu.jar b/lib/korapxml2conllu.jar
new file mode 100644
index 0000000..e8f666a
--- /dev/null
+++ b/lib/korapxml2conllu.jar
Binary files differ