Build external libs explicitly

smecalculus · Feb 25, 2024 · 35b251a · 35b251a
1 parent 9bc3008
commit 35b251a
Show file tree

Hide file tree

Showing 12 changed files with 166 additions and 77 deletions.
diff --git a/.github/Dockerfile b/.github/Dockerfile
diff --git a/baker/ansible/binaries.yaml b/baker/ansible/binaries.yaml
@@ -1,10 +1,26 @@
 ---
+- name: Building and checking
+  hosts: lib
+  tasks:
+    - ansible.builtin.import_tasks:  # noqa: name[missing]
+        file: tasks/lib/capture.yaml
+    - ansible.builtin.import_tasks:  # noqa: name[missing]
+        file: tasks/java/check.yaml
+      vars:
+        maven_projects: "{{ product.libs|map(attribute='name') }}"
+      when: binary_status is changed
+    - ansible.builtin.import_tasks:  # noqa: name[missing]
+        file: tasks/lib/build-check-publish.yaml
+      vars:
+        maven_phase: "{{ 'deploy' if repo_mode == 'rw' else 'install' }}"
+      when: binary_status is changed
+
 - name: Building and checking
   hosts: app
   tasks:
     - ansible.builtin.import_tasks:  # noqa: name[missing]
         file: tasks/java/check.yaml
     - ansible.builtin.import_tasks:  # noqa: name[missing]
-        file: tasks/app/build-and-check.yaml
+        file: tasks/app/build-check.yaml
       vars:
         maven_phase: package
diff --git a/baker/ansible/images.yaml b/baker/ansible/images.yaml
@@ -17,9 +17,9 @@
       vars:
         image_keys: >-
           {{ image_status.results
-           | select('changed')
-           | map(attribute='vendor')
-           | map('regex_replace', '^(.*)$', 'db/\1/' ~ devenv)
+            | select('changed')
+            | map(attribute='vendor')
+            | map('regex_replace', '^(.*)$', 'db/\1/' ~ devenv)
           }}
       when: image_status is changed
     - ansible.builtin.import_tasks:  # noqa: name[missing]
@@ -34,8 +34,8 @@
       vars:
         maven_projects: >-
           {{ image_status.results
-           | select('changed')
-           | map(attribute='app')
+            | select('changed')
+            | map(attribute='app')
           }}
       when: image_status is changed
     - ansible.builtin.import_role:  # noqa: name[missing]
@@ -44,15 +44,13 @@
       vars:
         image_keys: >-
           {{ image_status.results
-           | select('changed')
-           | map(attribute='app')
-           | map('regex_replace', '^(.*)$', 'app/\1/' ~ devenv)
+            | select('changed')
+            | map(attribute='app')
+            | map('regex_replace', '^(.*)$', 'app/\1/' ~ devenv)
           }}
       when: image_status is changed
     - ansible.builtin.import_tasks:  # noqa: name[missing]
-        file: tasks/app/build-and-check.yaml
-      vars:
-        maven_phase: "{{ 'deploy' if repo_mode == 'rw' else 'install' }}"
+        file: tasks/app/build-check.yaml
       when: image_status is changed
 
 - name: Publishing

diff --git a/baker/ansible/inventory/aliases.yaml b/baker/ansible/inventory/aliases.yaml
@@ -4,6 +4,9 @@ sources:
     java:
     ansible:
     github:
+binaries:
+  hosts:
+    lib:
 images:
   hosts:
     db:

diff --git a/baker/ansible/inventory/group_vars/all/stacks.yaml b/baker/ansible/inventory/group_vars/all/stacks.yaml
@@ -33,6 +33,9 @@ product:
     kotlin:
       - service: sepuling
         name: sepuling-kotlin
+  libs:
+    - name: abstraction-client
+    - name: messaging-client
 
 config_exts:
   lightbend_config: conf

diff --git a/baker/ansible/tasks/app/build-and-check.yaml → baker/ansible/tasks/app/build-check.yaml b/baker/ansible/tasks/app/build-and-check.yaml → baker/ansible/tasks/app/build-check.yaml
@@ -1,8 +1,8 @@
 ---
-- name: Build binaries
+- name: Build
   ansible.builtin.command:
     cmd: >-
-      mvn {{ maven_phase|mandatory }}
+      mvn verify
         --activate-profiles {{ devenv }}
         --no-snapshot-updates
         --batch-mode
@@ -21,7 +21,7 @@
         --projects {{
           product.apps.values()
           | flatten
-          | map(attribute='binary')
+          | map(attribute='name')
           | map('regex_replace', '^', ':')
           | join(',')
         }}

diff --git a/baker/ansible/tasks/java/check.yaml b/baker/ansible/tasks/java/check.yaml
@@ -11,6 +11,7 @@
         --activate-profiles {{ devenv }}
         --no-snapshot-updates
         --batch-mode
+        --also-make
         --threads 2
       {% if maven_projects is defined %}
         --projects {{

diff --git a/baker/ansible/tasks/lib/build-check-publish.yaml b/baker/ansible/tasks/lib/build-check-publish.yaml
@@ -0,0 +1,21 @@
+---
+- name: Build
+  ansible.builtin.command:
+    cmd: >-
+      mvn {{ maven_phase|mandatory }}
+        --activate-profiles {{ devenv }}
+        --no-snapshot-updates
+        --batch-mode
+        --fail-fast
+        --also-make
+        --threads 2
+        --projects {{
+          product.libs
+          | map(attribute='name')
+          | map('regex_replace', '^', ':')
+          | join(',')
+        }}
+        --define revision={{ binary_tag }}
+    chdir: "{{ project.dir }}"
+    strip_empty_ends: false
+  changed_when: true
diff --git a/baker/ansible/tasks/lib/capture.yaml b/baker/ansible/tasks/lib/capture.yaml
@@ -0,0 +1,32 @@
+---
+- name: Capture CID's
+  ansible.builtin.command:
+    cmd: git hash-object --stdin
+    stdin: |
+      {% for lib in product.libs %}
+      {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=lib/' ~ lib.name) }}
+      {% endfor %}
+  register: binary_cid
+  changed_when: false
+
+- name: Declare tag
+  ansible.builtin.set_fact:
+    binary_tag: "{{ devenv }}-{{ binary_cid.stdout[:7] }}"
+  changed_when: false
+
+- name: Capture status
+  ansible.builtin.command:
+    cmd: >-
+      mvn dependency:copy@capture
+        --projects :lib
+      {% if repo_mode == 'n/a' %}
+        --offline
+      {% else %}
+        --define remoteRepositories=github::::https://{{ binary_repo }}/{{ project.org }}/{{ project.name }}
+      {% endif %}
+        --define revision={{ binary_tag }}
+    chdir: "{{ project.dir }}"
+  register: binary_status
+  failed_when: false
+  changed_when:
+    - binary_status.rc != 0
diff --git a/lib/abstraction-client/pom.xml b/lib/abstraction-client/pom.xml
@@ -21,34 +21,26 @@
     </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>publish</id>
-      <activation>
-        <jdk>17</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>flatten-maven-plugin</artifactId>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-install-plugin</artifactId>
-            <configuration>
-              <skip>false</skip>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <configuration>
-              <skip>false</skip>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-install-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/lib/messaging-client/pom.xml b/lib/messaging-client/pom.xml
@@ -34,34 +34,26 @@
     </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>publish</id>
-      <activation>
-        <jdk>17</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>flatten-maven-plugin</artifactId>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-install-plugin</artifactId>
-            <configuration>
-              <skip>false</skip>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <configuration>
-              <skip>false</skip>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-install-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/lib/pom.xml b/lib/pom.xml
@@ -235,5 +235,38 @@
         <artifactId>jacoco-maven-plugin</artifactId>
       </plugin>
     </plugins>
+
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>capture</id>
+              <goals>
+                <goal>copy</goal>
+              </goals>
+              <configuration>
+                <outputDirectory>${project.build.directory}</outputDirectory>
+                <artifactItems>
+                  <artifactItem>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>abstraction-client</artifactId>
+                    <version>${project.version}</version>
+                  </artifactItem>
+                  <artifactItem>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>messaging-client</artifactId>
+                    <version>${project.version}</version>
+                    <type>jar</type>
+                  </artifactItem>
+                </artifactItems>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
 </project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,9 @@ sources: @@
         java:
         ansible:
         github:
+    binaries:
+      hosts:
+        lib:
     images:
       hosts:
         db:
@@ Expand Down @@