From 6d94ff0179500abc803828f3521a59866895f3f0 Mon Sep 17 00:00:00 2001
From: Emily Wedek <170527786+bunbry@users.noreply.github.com>
Date: Tue, 1 Oct 2024 14:40:35 +0200
Subject: [PATCH 1/4] ci: make parent POM versions CI friendly
Using the ${revision} placeholder and the flatten-maven-plugin to simplify CI implementation.
---
.gitignore | 3 ++-
pom.xml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 52b1907..03fc5c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@
.project
target/
.idea
-*.iml
\ No newline at end of file
+*.iml
+.flattened-pom.xml
diff --git a/pom.xml b/pom.xml
index f034216..a373988 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
org.aktin
aktin
- 0.12
+ ${revision}
github.com
From 4e5912a402fb12dce343381505ef78614b9e93f1 Mon Sep 17 00:00:00 2001
From: Emily Wedek <170527786+bunbry@users.noreply.github.com>
Date: Thu, 7 Nov 2024 16:01:32 +0100
Subject: [PATCH 2/4] ci: add ci.yml
---
.github/workflows/ci.yml | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 .github/workflows/ci.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..9a6bda6
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,17 @@
+name: CI/CD
+
+on:
+ push:
+ branches:
+ - master
+ tags:
+ - v[0-9]+.[0-9]+**
+ pull_request:
+ branches:
+ - master
+
+jobs:
+ build:
+ uses: aktin/aktin-github-scripts/workflows/maven-build-deploy.yml
+ with:
+ java-version: 8
From 0a188bda8208c950e2d63603beee6eeaa47c14c6 Mon Sep 17 00:00:00 2001
From: Emily Wedek <170527786+bunbry@users.noreply.github.com>
Date: Thu, 7 Nov 2024 16:27:25 +0100
Subject: [PATCH 3/4] fix: specifiy reusable workflow on main
---
.github/workflows/ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9a6bda6..5d71213 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,6 +12,6 @@ on:
jobs:
build:
- uses: aktin/aktin-github-scripts/workflows/maven-build-deploy.yml
+ uses: aktin/aktin-github-scripts/workflows/maven-build-deploy.yml@main
with:
java-version: 8
From a1658d60ae6b02ec3daaefa087d25a3dfcb915ee Mon Sep 17 00:00:00 2001
From: Emily Wedek <170527786+bunbry@users.noreply.github.com>
Date: Thu, 7 Nov 2024 16:58:38 +0100
Subject: [PATCH 4/4] fix: reusable workflows must be rooted in
.github/workflows
---
.github/workflows/ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5d71213..b767441 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,6 +12,6 @@ on:
jobs:
build:
- uses: aktin/aktin-github-scripts/workflows/maven-build-deploy.yml@main
+ uses: aktin/aktin-github-scripts/.github/workflows/maven-build-deploy.yml@main
with:
java-version: 8