From 20f4f822c673bf0c76ee94e291c8d60d6b6e56e7 Mon Sep 17 00:00:00 2001
From: "nikita.smirnov" <nikita.smirnov@exactprosystems.com>
Date: Wed, 3 Jul 2024 17:50:29 +0400
Subject: [PATCH] Updated GitHub workflow

---
 .github/workflows/build-dev-release.yml         | 15 +++++++++++++++
 .../{docker-publish.yml => build-release.yml}   | 17 ++++++-----------
 ...ev-docker-publish.yml => build-sanpshot.yml} |  3 ++-
 .github/workflows/ci-unwelcome-words.yml        |  4 ++--
 gradle/wrapper/gradle-wrapper.properties        |  2 +-
 5 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 .github/workflows/build-dev-release.yml
 rename .github/workflows/{docker-publish.yml => build-release.yml} (53%)
 rename .github/workflows/{dev-docker-publish.yml => build-sanpshot.yml} (75%)

diff --git a/.github/workflows/build-dev-release.yml b/.github/workflows/build-dev-release.yml
new file mode 100644
index 0000000..b438d11
--- /dev/null
+++ b/.github/workflows/build-dev-release.yml
@@ -0,0 +1,15 @@
+name: Build and publish dev release Docker image to Github Container Registry ghcr.io
+
+on: workflow_dispatch
+
+jobs:
+  build:
+    uses: th2-net/.github/.github/workflows/compound-java.yml@main
+    with:
+      build-target: 'Docker'
+      devRelease: true
+      createTag: true
+      docker-username: ${{ github.actor }}
+    secrets:
+      docker-password: ${{ secrets.GITHUB_TOKEN }}
+      nvd-api-key: ${{ secrets.NVD_APIKEY }}
\ No newline at end of file
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/build-release.yml
similarity index 53%
rename from .github/workflows/docker-publish.yml
rename to .github/workflows/build-release.yml
index cec50a6..dcf70be 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/build-release.yml
@@ -1,20 +1,15 @@
-name: Build and publish Docker distributions to Github Container Registry ghcr.io
+name: Build and publish release Docker image to Github Container Registry ghcr.io
 
-on:
-  push:
-    branches:
-      - master
-      - version-*
-    paths:
-      - gradle.properties
-#    - package_info.json  
+on: workflow_dispatch
 
 jobs:
-  build-job:
+  build:
     uses: th2-net/.github/.github/workflows/compound-java.yml@main
     with:
       build-target: 'Docker'
+      devRelease: false
+      createTag: true
       docker-username: ${{ github.actor }}
     secrets:
       docker-password: ${{ secrets.GITHUB_TOKEN }}
-      
\ No newline at end of file
+      nvd-api-key: ${{ secrets.NVD_APIKEY }}
\ No newline at end of file
diff --git a/.github/workflows/dev-docker-publish.yml b/.github/workflows/build-sanpshot.yml
similarity index 75%
rename from .github/workflows/dev-docker-publish.yml
rename to .github/workflows/build-sanpshot.yml
index 6f77755..9366a44 100644
--- a/.github/workflows/dev-docker-publish.yml
+++ b/.github/workflows/build-sanpshot.yml
@@ -1,4 +1,4 @@
-name: Dev build and publish Docker distributions to Github Container Registry ghcr.io
+name: Build and publish Docker image to Github Container Registry ghcr.io
 
 on:
   push:
@@ -17,3 +17,4 @@ jobs:
       docker-username: ${{ github.actor }}
     secrets:
       docker-password: ${{ secrets.GITHUB_TOKEN }}
+      nvd-api-key: ${{ secrets.NVD_APIKEY }}
\ No newline at end of file
diff --git a/.github/workflows/ci-unwelcome-words.yml b/.github/workflows/ci-unwelcome-words.yml
index 686d0fd..b23bb56 100644
--- a/.github/workflows/ci-unwelcome-words.yml
+++ b/.github/workflows/ci-unwelcome-words.yml
@@ -7,11 +7,11 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.sha }}
       - name: Checkout tool
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: exactpro-th2/ci-github-action
           ref: master
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 69a9715..070cb70 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists