Merge pull request #106 from ncsa/main

Main to Dev

.github/workflows/docker.yml

@@ -164,17 +164,23 @@ jobs:
         echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV
 
         if [ "$BRANCH" == "main" ]; then
-          VERSION=$(cat manual_jb/content/_config.yml | grep "version" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g")
-          VERSIONS="latest"
-          OLDVERSION=""
-          TMPVERSION=$VERSION
-          while [ "$OLDVERSION" != "$TMPVERSION" ]; do
-            VERSIONS="${VERSIONS} ${TMPVERSION}"
-            OLDVERSION="${TMPVERSION}"
-            TMPVERSION=$(echo ${OLDVERSION} | sed 's/\.[0-9]*$//')
-          done
-          echo "VERSION=$VERSION" >> $GITHUB_ENV
-          echo "TAGS=${VERSIONS}" >> $GITHUB_ENV
+          CHANGELOG_FILE="${{ matrix.workdir }}/CHANGELOG.md"
+          if [ -e "$CHANGELOG_FILE" ]; then
+            VERSION=$(cat "$CHANGELOG_FILE" | grep -Eo '\[[0-9]+\.[0-9]+\.[0-9]+\]'| head -1 | tr -d '[]')
+            VERSIONS="latest"
+            OLDVERSION=""
+            TMPVERSION=$VERSION
+            while [ "$OLDVERSION" != "$TMPVERSION" ]; do
+              VERSIONS="${VERSIONS} ${TMPVERSION}"
+              OLDVERSION="${TMPVERSION}"
+              TMPVERSION=$(echo ${OLDVERSION} | sed 's/\.[0-9]*$//')
+            done
+            echo "VERSION=$VERSION" >> $GITHUB_ENV
+            echo "TAGS=${VERSIONS}" >> $GITHUB_ENV
+          else
+            echo "VERSION=latest" >> $GITHUB_ENV
+            echo "TAGS=latest" >> $GITHUB_ENV          
+          fi
         elif [ "$BRANCH" == "develop" ]; then
           echo "VERSION=develop" >> $GITHUB_ENV
           echo "TAGS=develop" >> $GITHUB_ENV

.github/workflows/manual.yml

@@ -156,32 +156,34 @@ jobs:
               BRANCH="PR-${{github.event.pull_request.number}}"
           else
             BRANCH=${GITHUB_REF##*/}
-            if [[ $BRANCH =~ [0-9]+ ]]; then
-              BRANCH="PR-${BASH_REMATCH[0]}"
-            fi
           fi
           echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV
-          
+
           if [ "$BRANCH" == "main" ]; then
-            VERSION=$(cat manual_jb/content/_config.yml | grep "version" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g")
-            VERSIONS="latest"
-            OLDVERSION=""
-            TMPVERSION=$VERSION
-            while [ "$OLDVERSION" != "$TMPVERSION" ]; do
-              VERSIONS="${VERSIONS} ${TMPVERSION}"
-              OLDVERSION="${TMPVERSION}"
-              TMPVERSION=$(echo ${OLDVERSION} | sed 's/\.[0-9]*$//')
-            done
-            echo "VERSION=$VERSION" >> $GITHUB_ENV
-            echo "TAGS=${VERSIONS}" >> $GITHUB_ENV
+            CHANGELOG_FILE="${{ matrix.workdir }}/CHANGELOG.md"
+            if [ -e "$CHANGELOG_FILE" ]; then
+              VERSION=$(cat "$CHANGELOG_FILE" | grep -Eo '\[[0-9]+\.[0-9]+\.[0-9]+\]'| head -1 | tr -d '[]')
+              VERSIONS="latest"
+              OLDVERSION=""
+              TMPVERSION=$VERSION
+              while [ "$OLDVERSION" != "$TMPVERSION" ]; do
+                VERSIONS="${VERSIONS} ${TMPVERSION}"
+                OLDVERSION="${TMPVERSION}"
+                TMPVERSION=$(echo ${OLDVERSION} | sed 's/\.[0-9]*$//')
+              done
+              echo "VERSION=$VERSION" >> $GITHUB_ENV
+              echo "TAGS=${VERSIONS}" >> $GITHUB_ENV
+            else
+              echo "VERSION=latest" >> $GITHUB_ENV
+              echo "TAGS=latest" >> $GITHUB_ENV          
+            fi
           elif [ "$BRANCH" == "develop" ]; then
             echo "VERSION=develop" >> $GITHUB_ENV
             echo "TAGS=develop" >> $GITHUB_ENV
           else
             echo "VERSION=testing" >> $GITHUB_ENV
             echo "TAGS=${BRANCH}" >> $GITHUB_ENV
           fi
-
       - name: Print Version tag
         run: |
           echo "${{ env.TAGS }}"

CHANGELOG.md

@@ -4,20 +4,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [Beta-1] - 01-23-2024
 
 ### Added
 - Github action for building containers [#26](https://github.com/ncsa/standalone-smm-analytics/issues/26)
 - Github action for manually building containers [#94](https://github.com/ncsa/standalone-smm-analytics/issues/94)
+- Docker compose file for clowder connection [#88](https://github.com/ncsa/standalone-smm-analytics/issues/88)
 
 ### Changed
 - Reorganized repository structure [#10](https://github.com/ncsa/standalone-smm-analytics/issues/10)
 
 ### Fixed
 - Rabbitmq username and password [#61](https://github.com/ncsa/standalone-smm-analytics/issues/90)
 
-### Added
-- Docker compose file for clowder connection [#88](https://github.com/ncsa/standalone-smm-analytics/issues/88)
 
 ## [Beta] - 10-26-2023
 

containerized_analytics/clowder/clowder_create_collection/CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.1.1] - 01-23-2024
 
 ### Fixed
 - Rabbitmq username and password [#61](https://github.com/ncsa/standalone-smm-analytics/issues/90)

containerized_analytics/clowder/clowder_create_dataset/CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.1.1] - 01-23-2024
 
 ### Fixed
 - Rabbitmq username and password [#61](https://github.com/ncsa/standalone-smm-analytics/issues/90)

containerized_analytics/clowder/clowder_create_space/CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.1.1] - 01-23-2024
 
 ### Fixed
 - Rabbitmq username and password [#61](https://github.com/ncsa/standalone-smm-analytics/issues/90)

containerized_analytics/clowder/clowder_list/CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.1.1] - 01-23-2024
 
 ### Fixed
 - Rabbitmq username and password [#61](https://github.com/ncsa/standalone-smm-analytics/issues/90)

containerized_analytics/clowder/clowder_upload_file/CHANGELOG.md

@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## [Unreleased]
+## [0.1.3] - 01-23-2024
 
 ### Changed
 - Relax the condition of always require configuration file [#77](https://github.com/ncsa/standalone-smm-analytics/issues/77)

containerized_analytics/smile/autophrase/CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.1.7] - 01-23-2024
 
 ### Fixed
 - Email notification subject space issue [#102](https://github.com/ncsa/standalone-smm-analytics/issues/102)

containerized_analytics/smile/classification_predict/CHANGELOG.md

@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## [Unreleased]
+## [0.1.3] - 01-23-2024
 
 ### Fixed
 - Rabbitmq username and password [#61](https://github.com/ncsa/standalone-smm-analytics/issues/90)

containerized_analytics/smile/classification_split/CHANGELOG.md

@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## [Unreleased]
+## [0.1.3] - 01-23-2024
 
 ### Fixed
 - Rabbitmq username and password [#61](https://github.com/ncsa/standalone-smm-analytics/issues/90)

containerized_analytics/smile/classification_train/CHANGELOG.md

@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## [Unreleased]
+## [0.1.3] - 01-23-2024
 
 ### Fixed
 - Rabbitmq username and password [#61](https://github.com/ncsa/standalone-smm-analytics/issues/90)

containerized_analytics/smile/image_crawler/CHANGELOG.md

@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## [Unreleased]
+## [0.1.4] - 01-23-2024
 
 ### Fixed
 - Email notification subject space issue [#102](https://github.com/ncsa/standalone-smm-analytics/issues/102)

containerized_analytics/smile/name_entity_recognition/CHANGELOG.md

@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## [Unreleased]
+## [0.1.4] - 01-23-2024
 
 ### Fixed
 - Email notification subject space issue [#102](https://github.com/ncsa/standalone-smm-analytics/issues/102)

containerized_analytics/smile/network_analysis/CHANGELOG.md

@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## [Unreleased]
+## [0.1.5] - 01-23-2024
 
 ### Fixed
 - Email notification subject space issue [#102](https://github.com/ncsa/standalone-smm-analytics/issues/102)

containerized_analytics/smile/preprocessing/CHANGELOG.md

@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## [Unreleased]
+## [0.1.5] - 01-23-2024
 
 ### Fixed
 - Email notification subject space issue [#102](https://github.com/ncsa/standalone-smm-analytics/issues/102)

containerized_analytics/smile/sentiment_analysis/CHANGELOG.md

@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## [Unreleased]
+## [0.1.7] - 01-23-2024
 
 ### Fixed
 - Email notification subject space issue [#102](https://github.com/ncsa/standalone-smm-analytics/issues/102)

containerized_analytics/smile/topic_modeling/CHANGELOG.md

@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## [Unreleased]
+## [0.1.5] - 01-23-2024
 
 ### Fixed
 - Email notification subject space issue [#102](https://github.com/ncsa/standalone-smm-analytics/issues/102)