From 7876204280cb3afa45e8de63fd6e433754329894 Mon Sep 17 00:00:00 2001 From: Johannes Pietrzyk Date: Wed, 19 Feb 2025 20:48:40 +0100 Subject: [PATCH 1/3] Fixed auto tagging for dockerimages --- .github/workflows/build_and_push_dockerhub.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_push_dockerhub.yml b/.github/workflows/build_and_push_dockerhub.yml index dbec53b..5eabaaf 100644 --- a/.github/workflows/build_and_push_dockerhub.yml +++ b/.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' From 297788689a676466a3b1f520a28cb861590e8258 Mon Sep 17 00:00:00 2001 From: Johannes Pietrzyk Date: Wed, 19 Feb 2025 20:53:55 +0100 Subject: [PATCH 2/3] Fixed typo. --- .github/workflows/build_and_push_dockerhub.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_push_dockerhub.yml b/.github/workflows/build_and_push_dockerhub.yml index 5eabaaf..dd821b3 100644 --- a/.github/workflows/build_and_push_dockerhub.yml +++ b/.github/workflows/build_and_push_dockerhub.yml @@ -89,7 +89,7 @@ jobs: if [ "${{ github.event_name }}" == "pull_request" ]; then echo "tag=${{ github.head_ref }}" >> "${GITHUB_OUTPUT}" else - if [[ "${{ github.ref_type }}" == "tag"]]; then + 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}" From 8d9a46f92ad3e1b8bb3d58dcaed1e747ac4b4163 Mon Sep 17 00:00:00 2001 From: Johannes Pietrzyk Date: Thu, 20 Feb 2025 13:27:23 +0100 Subject: [PATCH 3/3] Added check + support for wget if curl does not exist on the target system in setup_tsl.sh --- .github/workflows/release/tarball/setup_tsl.sh | 9 ++++++++- README.md | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release/tarball/setup_tsl.sh b/.github/workflows/release/tarball/setup_tsl.sh index 819b975..470ffba 100644 --- a/.github/workflows/release/tarball/setup_tsl.sh +++ b/.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}") diff --git a/README.md b/README.md index a582cd0..bae921c 100644 --- a/README.md +++ b/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.