From 7dbfd1a51b4bd2be20c273050277ff40f1cd6916 Mon Sep 17 00:00:00 2001
From: Pavel Vetokhin
Date: Wed, 6 Sep 2023 07:19:39 +0300
Subject: [PATCH] Include tools cid to pipeline hash tree
---
.dx/binaries.yml | 2 +-
.dx/group_vars/all.yml | 1 +
.dx/tasks/pipeline/status.yml | 1 +
.github/dependabot.yml | 2 +-
.github/workflows/pipeline-beyond-doubt.yml | 2 +-
.github/workflows/pipeline-minimal.yml | 2 +-
.github/workflows/solution-convincing.yml | 6 +++---
{tools => .tools}/README.adoc | 0
{tools => .tools}/pom.xml | 0
9 files changed, 9 insertions(+), 7 deletions(-)
rename {tools => .tools}/README.adoc (100%)
rename {tools => .tools}/pom.xml (100%)
diff --git a/.dx/binaries.yml b/.dx/binaries.yml
index 268bc993..0618512c 100644
--- a/.dx/binaries.yml
+++ b/.dx/binaries.yml
@@ -103,7 +103,7 @@
antrun:run@units
antrun:run@integrations
antrun:run@overall
- chdir: "{{ playbook_dir }}/../tools"
+ chdir: "{{ playbook_dir }}/../.tools"
strip_empty_ends: false
changed_when: true
when: >
diff --git a/.dx/group_vars/all.yml b/.dx/group_vars/all.yml
index 5702b918..77ff75bd 100644
--- a/.dx/group_vars/all.yml
+++ b/.dx/group_vars/all.yml
@@ -8,6 +8,7 @@ environ: green
dx_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=.dx')[:7] }}"
env_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=.env/' ~ environ)[:7] }}"
+tool_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=.tools')[:7] }}"
test_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=tests')[:7] }}"
lib_version: 0.1.0-{{ lib_cid }}
diff --git a/.dx/tasks/pipeline/status.yml b/.dx/tasks/pipeline/status.yml
index 2b401ddf..ba2a7557 100644
--- a/.dx/tasks/pipeline/status.yml
+++ b/.dx/tasks/pipeline/status.yml
@@ -5,6 +5,7 @@
stdin: |
{{ dx_cid }}
{{ env_cid }}
+ {{ tool_cid }}
{{ test_cid }}
register: pipeline_tag
changed_when: false
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index abb5601a..8a874812 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -23,7 +23,7 @@ updates:
ignore:
- dependency-name: "org.smecalculus.bezmen:*"
- package-ecosystem: "maven"
- directory: "/tools"
+ directory: "/.tools"
schedule:
interval: "weekly"
- package-ecosystem: "docker"
diff --git a/.github/workflows/pipeline-beyond-doubt.yml b/.github/workflows/pipeline-beyond-doubt.yml
index 33a2d9ff..a45055d3 100644
--- a/.github/workflows/pipeline-beyond-doubt.yml
+++ b/.github/workflows/pipeline-beyond-doubt.yml
@@ -8,7 +8,7 @@ on:
- .dx/**
- .env/**
- .github/**
- - tools/**
+ - .tools/**
workflow_dispatch:
jobs:
diff --git a/.github/workflows/pipeline-minimal.yml b/.github/workflows/pipeline-minimal.yml
index 912e6245..336d80b4 100644
--- a/.github/workflows/pipeline-minimal.yml
+++ b/.github/workflows/pipeline-minimal.yml
@@ -8,7 +8,7 @@ on:
- .dx/**
- .env/**
- .github/**
- - tools/**
+ - .tools/**
workflow_dispatch:
jobs:
diff --git a/.github/workflows/solution-convincing.yml b/.github/workflows/solution-convincing.yml
index ec5a39dc..8441df8d 100644
--- a/.github/workflows/solution-convincing.yml
+++ b/.github/workflows/solution-convincing.yml
@@ -79,7 +79,7 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
update-comment: true
env:
- JACOCO_UNITS: tools/target/coverage/units/jacoco.xml
+ JACOCO_UNITS: .tools/target/coverage/units/jacoco.xml
- uses: madrapps/jacoco-report@v1.6
if: ${{ github.event_name == 'pull_request' && hashFiles(env.JACOCO_INTEGRATIONS) != '' }}
with:
@@ -88,7 +88,7 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
update-comment: true
env:
- JACOCO_INTEGRATIONS: tools/target/coverage/integrations/jacoco.xml
+ JACOCO_INTEGRATIONS: .tools/target/coverage/integrations/jacoco.xml
- uses: madrapps/jacoco-report@v1.6
if: ${{ github.event_name == 'pull_request' && hashFiles(env.JACOCO_OVERALL) != '' }}
with:
@@ -97,4 +97,4 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
update-comment: true
env:
- JACOCO_OVERALL: tools/target/coverage/overall/jacoco.xml
+ JACOCO_OVERALL: .tools/target/coverage/overall/jacoco.xml
diff --git a/tools/README.adoc b/.tools/README.adoc
similarity index 100%
rename from tools/README.adoc
rename to .tools/README.adoc
diff --git a/tools/pom.xml b/.tools/pom.xml
similarity index 100%
rename from tools/pom.xml
rename to .tools/pom.xml