ci: fix systemd build container (Resoves #323) (#324)

Co-authored-by: Steve Ramage <[email protected]>

Author: SJrX

src/test/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/semanticdata/optionvalues/OptionValueTest.kt

@@ -35,7 +35,7 @@ class OptionValueTest : AbstractUnitFileTest() {
 
     println("Missing:$totalMissingValidators")
     println("Found:$totalFoundValidators")
-    if (totalMissingValidators > 530) {
+    if (totalMissingValidators > 540) {
       assertEquals("Number of missing validators is too high at ${totalMissingValidators} vs. found ${totalFoundValidators}", sortedList, "")
     }
 

systemd-build/Systemd-Builder.Dockerfile

@@ -14,10 +14,6 @@ WORKDIR /opt/systemd-source/systemd
 
 RUN mkdir -p /mount/
 
-ADD systemd-build.sh /
-
-CMD /systemd-build.sh
-
 # Force cache to be invalidated after this point
 ARG BUILDDATE
 ENV BUILDDATE ${BUILDDATE:-notset}
@@ -29,5 +25,9 @@ RUN find . -type f -name meson.build -exec sed -i 's/install_emptydir(\(.*\), in
 
 RUN meson setup build
 
+ADD systemd-build.sh /
+
+CMD /systemd-build.sh
+
 RUN /systemd-build.sh
 

systemd-build/systemd-build.sh

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 
 echo "Git Pull" && \
+  git reset --hard HEAD &&\
   git pull && \
+  find . -type f -name meson.build -exec sed -i 's/install_emptydir(\(.*\), install_tag : .*)/install_emptydir(\1)/g' '{}' '+' && \
   echo "Run jinja2" && \
   python3 ./tools/meson-render-jinja2.py ./build/config.h ./src/core/load-fragment-gperf.gperf.in load-fragment-gperf.gperf &&  \
   echo "Copy file(s)" && \