ci: Ensure that systemd build cache is updated daily (Resolves #261)

Author: Steve Ramage

.github/workflows/main.yml

@@ -44,8 +44,8 @@ jobs:
       - name: Build with Gradle
         run: |
           mkdir -p ./build
+          docker compose --project-directory ./systemd-build up --build
           ./generate-changelog  > build/CHANGELOG
-          ./gradlew composeUp
           ./gradlew test buildPlugin
           ./gradlew --stop
       - name: Publish Unit Test Results

build.gradle.kts

@@ -35,6 +35,7 @@ plugins {
 
 dockerCompose {
   dockerComposeWorkingDirectory.set(file("./systemd-build/"))
+  setProjectName("systemdbuild")
 }
 
 group = "net.sjrx.intellij.plugins"

ci/release.Jenkinsfile

@@ -168,9 +168,9 @@ pipeline {
                 /check-if-image-exists
                 ''', returnStatus: true)
               }
-              systemdBuilderHash = sh(script: '''
-                  sha256sum ./systemd-build/Systemd-Builder.Dockerfile ./systemd-build/systemd-build.sh | sha256sum | sed -E "s/\\s.+$//g"
-            ''', returnStdout: true
+              systemdBuilderHash = sh(script: """
+                  sha256sum ./systemd-build/Systemd-Builder.Dockerfile ./systemd-build/systemd-build.sh | sha256sum | sed -E "s/\\s.+\$/-${buildDate}/g"
+            """, returnStdout: true
               ).trim()
               withEnv(["IMAGE=sjrx/systemd-plugin-systemd-builder-image", "TAG=${systemdBuilderHash}"]) {
                 systemdBuilderBuildNeeded = sh(script: '''
@@ -232,7 +232,7 @@ pipeline {
                   steps {
                     container('kaniko') {
                       sh """
-                    /kaniko/executor --force -f `pwd`/systemd-build/Systemd-Builder.Dockerfile  -c `pwd`/systemd-build/   --cache=true  --compressed-caching=false --destination=${env.DOCKER_REGISTRY_PREFIX}/systemd-plugin-systemd-builder-image:$systemdBuilderHash  --cache-copy-layers
+                    /kaniko/executor --force -f `pwd`/systemd-build/Systemd-Builder.Dockerfile  -c `pwd`/systemd-build/  --build-arg BUILDDATE=${buildDate} --cache=true  --compressed-caching=false --destination=${env.DOCKER_REGISTRY_PREFIX}/systemd-plugin-systemd-builder-image:$systemdBuilderHash  --cache-copy-layers
                       """
                     }
                   }

systemd-build/Systemd-Builder.Dockerfile

@@ -6,20 +6,25 @@ RUN ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
 RUN apt-get update && apt-get -y install git build-essential tzdata meson pkg-config gperf python3-jinja2 libcap-dev util-linux libmount1 libmount-dev
 
-
 RUN mkdir /opt/systemd-source
 
 RUN git clone https://github.com/systemd/systemd.git /opt/systemd-source/systemd
 
 WORKDIR /opt/systemd-source/systemd
 
-RUN meson setup build
-
 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}
+
+RUN git pull
+
+RUN meson setup build
+
 RUN /systemd-build.sh
 

systemd-build/docker-compose.yml

@@ -3,6 +3,8 @@ services:
     build:
       context: .
       dockerfile: Systemd-Builder.Dockerfile
+      args:
+        BUILDDATE: "unset"
     volumes:
       - ./build:/mount/
   ubuntu-units-builder: