Fixed auto tagging for dockerimages (#113)

* Fixed auto tagging for dockerimages

* Fixed typo.

* Added check + support for wget if curl does not exist on the target system in setup_tsl.sh

Author: JPietrzykTUD

.github/workflows/build_and_push_dockerhub.yml

@@ -86,10 +86,16 @@ jobs:
         shell: bash
         run: |
           set -x
-          if [ "${{ github.event_name }}" = "pull_request" ]; then
+          if [ "${{ github.event_name }}" == "pull_request" ]; then
             echo "tag=${{ github.head_ref }}" >> "${GITHUB_OUTPUT}"
           else
-            echo "tag=${{ github.ref_name }}" >> "${GITHUB_OUTPUT}"
+            if [[ "${{ github.ref_type }}" == "tag" ]]; then
+              TAG_COMMIT=$(git rev-list -n 1 ${{ github.ref }})
+              BRANCH=$(git branch -r --contains "${TAG_COMMIT}" | sed 's/origin\///' | grep -v HEAD | head -n 1 | awk '{$1=$1};1')
+              echo "tag=${BRANCH}" >> "${GITHUB_OUTPUT}"
+            else
+              echo "tag=${{ github.ref_name }}" >> "${GITHUB_OUTPUT}"
+            fi
           fi
 
       - name: 'Set image name output'

.github/workflows/release/tarball/setup_tsl.sh

@@ -54,7 +54,14 @@ mkdir -p "${out_path}"
 tmp_dir=$(mktemp -ud /tmp/libtsl-dev-XXXXXX)
 mkdir -p "${tmp_dir}"
 
-curl -L "https://github.com/db-tu-dresden/TSL/releases/latest/download/libtsl-dev.tar.gz" -o ${tmp_dir}/libtsl-dev.tar.gz
+if type curl > /dev/null 2>&1; then
+  curl -L "https://github.com/db-tu-dresden/TSL/releases/latest/download/libtsl-dev.tar.gz" -o ${tmp_dir}/libtsl-dev.tar.gz
+elif type wget > /dev/null 2>&1; then
+  wget -O ${tmp_dir}/libtsl-dev.tar.gz "https://github.com/db-tu-dresden/TSL/releases/latest/download/libtsl-dev.tar.gz"
+else
+  echo "Please install curl or wget to download the library"
+  exit 1
+fi
 tar -xzf "${tmp_dir}/libtsl-dev.tar.gz" -C "${tmp_dir}"
 chmod 755 "${tmp_dir}"/*.sh
 supported_path=$("${tmp_dir}"/select_flavor.sh "${tmp_dir}")

README.md

@@ -35,7 +35,7 @@ The latest release is available under [Releases](https://github.com/db-tu-dresde
 
 To download the TSL to the current working directory, just run
 ~~~console
-curl -L -s "https://github.com/db-tu-dresden/TSL/releases/latest/download/install_tsl.sh" | /bin/bash
+curl -L -s "https://github.com/db-tu-dresden/TSL/releases/latest/download/setup_tsl.sh" | /bin/bash
 ~~~
 
 If you want to "install" the TSL (the header files will be placed at /usr/include/tsl), we prepared an `rpm` and a `deb` package.