From c33f0f19daea7732705a99529e40538ae1c5c97a Mon Sep 17 00:00:00 2001
From: TC Johnson <tc@veilid.org>
Date: Mon, 29 Apr 2024 15:24:04 -0500
Subject: [PATCH] Added Earthfile condition and RPM spec fix

Dry run will now trigger for Earthfile changes. I also reordered the
changelog in veilid-server.spec to descending to correct that error.

Commented out the crates.io publishing dry run. This branch does not
have access to the protected variables.
---
 .gitlab-ci.yml                               | 43 ++++++++++++--------
 package/rpm/veilid-server/veilid-server.spec |  5 ++-
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d48765ff..bc1ddf12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -180,7 +180,7 @@ delete_build_machines:
   rules:
     - if: '$CI_COMMIT_TAG =~ /v\d.+/'
 
-# Dryrun release -- triggered by changes in .gitlab-ci.yml or CICD scripts
+# Dryrun release -- triggered by changes in .gitlab-ci.yml, CICD scripts, or Earthfile
 
 dryrun_create_build_machines:
   stage: build_packages
@@ -195,6 +195,7 @@ dryrun_create_build_machines:
       changes:
         - .gitlab-ci.yml
         - scripts/cicd/**/*
+        - Earthfile
   
 dryrun_package_amd64_deb:
   stage: build_packages
@@ -211,6 +212,7 @@ dryrun_package_amd64_deb:
       changes:
         - .gitlab-ci.yml
         - scripts/cicd/**/*
+        - Earthfile
 
 dryrun_package_arm64_deb:
   stage: build_packages
@@ -227,6 +229,7 @@ dryrun_package_arm64_deb:
       changes:
         - .gitlab-ci.yml
         - scripts/cicd/**/*
+        - Earthfile
 
 dryrun_package_amd64_rpm:
   stage: build_packages
@@ -243,22 +246,24 @@ dryrun_package_amd64_rpm:
       changes:
         - .gitlab-ci.yml
         - scripts/cicd/**/*
+        - Earthfile
 
-dryrun_publish_crates:
-  stage: build_packages
-  needs:
-    - dryrun_create_build_machines
-  tags:
-    - build-amd64-deb
-  script:
-    - vlt login
-    - vlt run --command="cargo publish -p veilid-tools --dry-run"
-    - vlt run --command="cargo publish -p veilid-core --dry-run"
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "push"
-      changes:
-        - .gitlab-ci.yml
-        - scripts/cicd/**/*
+# dryrun_publish_crates:
+#   stage: build_packages
+#   needs:
+#     - dryrun_create_build_machines
+#   tags:
+#     - build-amd64-deb
+#   script:
+#     - vlt login
+#     - vlt run --command="cargo publish -p veilid-tools --dry-run"
+#     - vlt run --command="cargo publish -p veilid-core --dry-run"
+#   rules:
+#     - if: $CI_PIPELINE_SOURCE == "push"
+#       changes:
+#         - .gitlab-ci.yml
+#         - scripts/cicd/**/*
+#         - Earthfile
 
 dryrun_publish_python:
   stage: build_packages
@@ -274,6 +279,7 @@ dryrun_publish_python:
       changes:
         - .gitlab-ci.yml
         - scripts/cicd/**/*
+        - Earthfile
 
 dryrun_build_repositories:
   stage: distribute
@@ -289,6 +295,7 @@ dryrun_build_repositories:
       changes:
         - .gitlab-ci.yml
         - scripts/cicd/**/*
+        - Earthfile
 
 dryrun_deploy_repos:
   stage: distribute
@@ -303,6 +310,7 @@ dryrun_deploy_repos:
       changes:
         - .gitlab-ci.yml
         - scripts/cicd/**/*
+        - Earthfile
 
 dryrun_delete_build_machines:
   stage: distribute
@@ -318,4 +326,5 @@ dryrun_delete_build_machines:
     - if: $CI_PIPELINE_SOURCE == "push"
       changes:
         - .gitlab-ci.yml
-        - scripts/cicd/**/*
\ No newline at end of file
+        - scripts/cicd/**/*
+        - Earthfile
\ No newline at end of file
diff --git a/package/rpm/veilid-server/veilid-server.spec b/package/rpm/veilid-server/veilid-server.spec
index 9d3d50d1..f8a881c2 100644
--- a/package/rpm/veilid-server/veilid-server.spec
+++ b/package/rpm/veilid-server/veilid-server.spec
@@ -57,7 +57,8 @@ else
 fi
 
 %changelog
-* Sun Jul 2 2023 TC <tc@veilid.org>
-- experimental RPM building
 * Sun Apr 28 2024 Christien Rioux <chris@veilid.org>
 - add ipc directory to installation
+* Sun Jul 2 2023 TC <tc@veilid.org>
+- experimental RPM building
+