Merge pull request #105 from tamada/release/v2.4.6

update workflow of github actions for publishing site, try again
tamada · Jul 28, 2021 · 2bf2c0a · 2bf2c0a
2 parents 19450e7 + d056555
commit 2bf2c0a
Show file tree

Hide file tree

Showing 16 changed files with 45 additions and 42 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -50,7 +50,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
 
-# Build packages, site
+# Build packages, site, distribution file
       - name: Build
         run: |
           bash ./bin/setup_project.sh
@@ -62,11 +62,6 @@ jobs:
         run: |
           bash ./bin/build_site.sh
 
-      - name: Publish Site
-        run: |
-          git worktree list
-          git -C site/public push origin gh-pages
-
       - name: Build Dist
         run:
           bash ./bin/make_dist.sh

diff --git a/README.md b/README.md
@@ -5,11 +5,11 @@
 [![codebeat badge](https://codebeat.co/badges/8e8c5e70-cb07-4f58-941c-3ddb64f3c059)](https://codebeat.co/projects/github-com-tamada-pochi-main)
 
 [![License](https://img.shields.io/badge/License-Apache%202.0-green.svg)](https://github.com/tamada/pochi/blob/master/LICENSE)
-[![Version](https://img.shields.io/badge/Version-2.4.5-green.svg)](https://github.com/tamada/pochi/releases/tag/v2.4.5)
+[![Version](https://img.shields.io/badge/Version-2.4.6-green.svg)](https://github.com/tamada/pochi/releases/tag/v2.4.6)
 [![DOI](https://img.shields.io/badge/DOI-10.5281/zenodo.4271132-green.svg)](https://zenodo.org/badge/latestdoi/82773287)
 
-[![Javadoc](https://img.shields.io/badge/Javadoc-v2.4.5-blue?logo=java)](https://tamada.github.io/pochi/apidocs)
-[![Docker](https://img.shields.io/badge/Docker-ghcr.io%2Ftamada%2Fpochi%3A2.4.5-blue?logo=docker)](https://github.com/users/tamada/packages/container/package/pochi)
+[![Javadoc](https://img.shields.io/badge/Javadoc-v2.4.6-blue?logo=java)](https://tamada.github.io/pochi/apidocs)
+[![Docker](https://img.shields.io/badge/Docker-ghcr.io%2Ftamada%2Fpochi%3A2.4.6-blue?logo=docker)](https://github.com/users/tamada/packages/container/package/pochi)
 [![GitHub Discussion](https://img.shields.io/badge/GitHub-Discussions-blue?logo=github)](https://github.com/tamada/pochi/discussions)
 
 Detecting the software theft, the birthmark toolkit for the JVM platform.
@@ -82,7 +82,8 @@ For more detail, see [:ant: Examples](https://tamada.github.io/pochi/examples).
 Container images of **pochi** for Docker are:
 
 * [`ghcr.io/tamada/pochi`](https://github.com/users/tamada/packages/container/package/pochi)
-  * `2.4.5`, `latest`
+  * `2.4.6`, `latest`
+  * `2.4.5`
   * `2.4.4`
   * `2.4.3`
   * `2.4.2`
@@ -108,7 +109,7 @@ Container images of **pochi** for Docker are:
   * `1.0.0`
     * accept only `.js` script files.
 
-[![Docker](https://img.shields.io/badge/Docker-ghcir.io%2Ftamada%2Fpochi%3A2.4.5-blue?logo=docker)](https://github.com/users/tamada/packages/container/package/pochi)
+[![Docker](https://img.shields.io/badge/Docker-ghcir.io%2Ftamada%2Fpochi%3A2.4.6-blue?logo=docker)](https://github.com/users/tamada/packages/container/package/pochi)
 
 To run **pochi** on Docker container OS, type the following commands.
 
@@ -156,10 +157,10 @@ Then, add the dependencies of your `pom.xml`.
 
 | groupId            | artifactId   | version |
 |--------------------|--------------|---------|
-|`jp.cafebabe.pochi` | `kunai2`     | `2.4.5` |
-|`jp.cafebabe.pochi` | `pochi-core` | `2.4.5` |
-|`jp.cafebabe.pochi` | `pochi-api`  | `2.4.5` |
-|`jp.cafebabe.pochi` | `pochi-cmd`  | `2.4.5` |
+|`jp.cafebabe.pochi` | `kunai2`     | `2.4.6` |
+|`jp.cafebabe.pochi` | `pochi-core` | `2.4.6` |
+|`jp.cafebabe.pochi` | `pochi-api`  | `2.4.6` |
+|`jp.cafebabe.pochi` | `pochi-cmd`  | `2.4.6` |
 
 ## Modules
 

diff --git a/bin/build_site.sh b/bin/build_site.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-VERSION="2.4.5"
+VERSION="2.4.6"
 
 function build_apidocs() {
   mkdir -p site/msp
@@ -20,7 +20,13 @@ function build_apidocs() {
 }
 
 if [ ! -d site/public ]; then
+  echo "============== git worktree ==========="
+  git worktree
+  echo "============== git branch -a ==========="
+  git branch -a
   git worktree add site/public origin/gh-pages
+  echo "============== git worktree list ==========="
+  git worktree list
 fi
 
 if [ ! -f site/themes/cayman-hugo-theme/theme.toml ]; then

diff --git a/bin/make_dist.sh b/bin/make_dist.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-VERSION="2.4.5"
+VERSION="2.4.6"
 
 function mkdirIfNeeded () {
   if [ ! -d $1 ] ; then

diff --git a/dockers/pochi-groovysh/Dockerfile b/dockers/pochi-groovysh/Dockerfile
@@ -15,7 +15,7 @@ RUN    apk --no-cache add openjdk11=11.0.4_p4-r1 \
 # building pochi
 FROM alpine:3.10.1
 
-ARG PochiVersion="2.4.5"
+ARG PochiVersion="2.4.6"
 ARG GroovyVersion="3.0.8"
 
 LABEL maintainer="Haruaki Tamada" \

diff --git a/dockers/pochi/Dockerfile b/dockers/pochi/Dockerfile
@@ -15,7 +15,7 @@ RUN    apk --no-cache add openjdk11=11.0.4_p4-r1 \
 # building pochi
 FROM alpine:3.10.1
 
-ARG PochiVersion="2.4.5"
+ARG PochiVersion="2.4.6"
 
 LABEL maintainer="Haruaki Tamada" \
       pochi-version="${PochiVersion}" \

diff --git a/kunai2/pom.xml b/kunai2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>jp.cafebabe</groupId>
     <artifactId>pochi</artifactId>
-    <version>2.4.5</version>
+    <version>2.4.6</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/pochi-api/pom.xml b/pochi-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>jp.cafebabe</groupId>
     <artifactId>pochi</artifactId>
-    <version>2.4.5</version>
+    <version>2.4.6</version>
   </parent>
 
   <groupId>jp.cafebabe.pochi</groupId>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>jp.cafebabe.pochi</groupId>
       <artifactId>kunai2</artifactId>
-      <version>2.4.5</version>
+      <version>2.4.6</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/pochi-cmd/pom.xml b/pochi-cmd/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>jp.cafebabe</groupId>
     <artifactId>pochi</artifactId>
-    <version>2.4.5</version>
+    <version>2.4.6</version>
   </parent>
 
   <groupId>jp.cafebabe.pochi</groupId>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>jp.cafebabe.pochi</groupId>
       <artifactId>pochi-core</artifactId>
-      <version>2.4.5</version>
+      <version>2.4.6</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/pochi-core/pom.xml b/pochi-core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>jp.cafebabe</groupId>
     <artifactId>pochi</artifactId>
-    <version>2.4.5</version>
+    <version>2.4.6</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -20,13 +20,13 @@
     <dependency>
       <groupId>jp.cafebabe.pochi</groupId>
       <artifactId>kunai2</artifactId>
-      <version>2.4.5</version>
+      <version>2.4.6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>jp.cafebabe.pochi</groupId>
       <artifactId>pochi-api</artifactId>
-      <version>2.4.5</version>
+      <version>2.4.6</version>
       <scope>compile</scope>
     </dependency>
     <!-- https://mvnrepository.com/artifact/org.apache.opennlp/opennlp-tools -->

diff --git a/pochi-core/src/main/java/jp/cafebabe/pochi/Pochi.java b/pochi-core/src/main/java/jp/cafebabe/pochi/Pochi.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 
 public class Pochi {
-    public static final String VERSION = "2.4.5";
+    public static final String VERSION = "2.4.6";
     private static final Pochi INSTANCE = new Pochi();
 
     private final Path home;

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>jp.cafebabe</groupId>
   <artifactId>pochi</artifactId>
-  <version>2.4.5</version>
+  <version>2.4.6</version>
   <packaging>pom</packaging>
 
   <modules>

diff --git a/site/content/_index.md b/site/content/_index.md
@@ -9,11 +9,11 @@ draft: false
 [![codebeat badge](https://codebeat.co/badges/8e8c5e70-cb07-4f58-941c-3ddb64f3c059)](https://codebeat.co/projects/github-com-tamada-pochi-main)
 
 [![License](https://img.shields.io/badge/License-Apache%202.0-green.svg?style=flat)](https://github.com/tamada/pochi/blob/master/LICENSE)
-[![Version](https://img.shields.io/badge/Version-2.4.5-green.svg)](https://github.com/tamada/pochi/releases/tag/v2.4.5)
+[![Version](https://img.shields.io/badge/Version-2.4.6-green.svg)](https://github.com/tamada/pochi/releases/tag/v2.4.6)
 [![DOI](https://img.shields.io/badge/DOI-10.5281/zenodo.4271132-green.svg)](https://zenodo.org/badge/latestdoi/82773287)
 
-[![Javadoc](https://img.shields.io/badge/Javadoc-v2.4.5-blue?logo=java)](https://tamada.github.io/pochi/apidocs)
-[![Docker](https://img.shields.io/badge/Docker-ghcr.io%2Ftamada%2Fpochi%3A2.4.5-blue?logo=docker)](https://github.com/users/tamada/packages/container/package/pochi)
+[![Javadoc](https://img.shields.io/badge/Javadoc-v2.4.6-blue?logo=java)](https://tamada.github.io/pochi/apidocs)
+[![Docker](https://img.shields.io/badge/Docker-ghcr.io%2Ftamada%2Fpochi%3A2.4.6-blue?logo=docker)](https://github.com/users/tamada/packages/container/package/pochi)
 [![GitHub Discussion](https://img.shields.io/badge/GitHub-Discussions-blue?logo=github)](https://github.com/tamada/pochi/discussions)
 
 Detecting the software theft, the birthmark toolkit for the JVM platform.

diff --git a/site/content/description.md b/site/content/description.md
@@ -49,7 +49,8 @@ For more detail, see [:ant: Examples](../examples).
 Container images of **pochi** for Docker are:
 
 * [`ghcr.io/tamada/pochi`](https://github.com/users/tamada/packages/container/package/pochi)
-    * `2.4.5`, `latest`
+    * `2.4.6`, `latest`
+  * `2.4.5`
   * `2.4.4`
   * `2.4.3`
   * `2.4.2`
@@ -75,7 +76,7 @@ Container images of **pochi** for Docker are:
     * `1.0.0`
         * accept only `.js` script files.
 
-[![Docker](https://img.shields.io/badge/Docker-ghcir.io%2Ftamada%2Fpochi%3A2.4.5-blue?logo=docker)](https://github.com/users/tamada/packages/container/package/pochi)
+[![Docker](https://img.shields.io/badge/Docker-ghcir.io%2Ftamada%2Fpochi%3A2.4.6-blue?logo=docker)](https://github.com/users/tamada/packages/container/package/pochi)
 
 To run **pochi** on Docker container OS, type the following commands.
 

diff --git a/site/content/install.md b/site/content/install.md
@@ -47,10 +47,10 @@ Then, add the dependencies of your `pom.xml`.
 
 | groupId            | artifactId   | version |
 |--------------------|--------------|---------|
-|`jp.cafebabe.pochi` | `kunai2`     | `2.4.5` |
-|`jp.cafebabe.pochi` | `pochi-core` | `2.4.5` |
-|`jp.cafebabe.pochi` | `pochi-api`  | `2.4.5` |
-|`jp.cafebabe.pochi` | `pochi-cmd`  | `2.4.5` |
+|`jp.cafebabe.pochi` | `kunai2`     | `2.4.6` |
+|`jp.cafebabe.pochi` | `pochi-core` | `2.4.6` |
+|`jp.cafebabe.pochi` | `pochi-api`  | `2.4.6` |
+|`jp.cafebabe.pochi` | `pochi-cmd`  | `2.4.6` |
 
 
 ## :briefcase: Requirements

diff --git a/site/pom.xml b/site/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>jp.cafebabe</groupId>
     <artifactId>pochi</artifactId>
-    <version>2.4.5</version>
+    <version>2.4.6</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -20,19 +20,19 @@
     <dependency>
       <groupId>jp.cafebabe.pochi</groupId>
       <artifactId>kunai2</artifactId>
-      <version>2.4.5</version>
+      <version>2.4.6</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>jp.cafebabe.pochi</groupId>
       <artifactId>pochi-api</artifactId>
-      <version>2.4.5</version>
+      <version>2.4.6</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>jp.cafebabe.pochi</groupId>
       <artifactId>pochi-core</artifactId>
-      <version>2.4.5</version>
+      <version>2.4.6</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>