diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index fc4bd9e..c4f9f15 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -34,16 +34,7 @@ jobs: - name: Determine tag name id: tag shell: bash - # taken from llama.cpp - run: | - SHORT_HASH="$(git rev-parse --short=7 HEAD)" - DEPTH="$(git rev-list --count HEAD)" - if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then - echo "name=dev-${DEPTH}-${SHORT_HASH}" >> $GITHUB_OUTPUT - else - SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-') - echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT - fi + run: . .github/workflows/tag_version.bash - name: Compress artifacts shell: bash @@ -142,16 +133,7 @@ jobs: - name: Determine tag name id: tag shell: bash - # taken from llama.cpp - run: | - SHORT_HASH="$(git rev-parse --short=7 HEAD)" - DEPTH="$(git rev-list --count HEAD)" - if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then - echo "name=dev-${DEPTH}-${SHORT_HASH}" >> $GITHUB_OUTPUT - else - SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-') - echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT - fi + run: . .github/workflows/tag_version.bash - name: rename apk id: rename_apk @@ -225,16 +207,7 @@ jobs: - name: Determine tag name id: tag shell: bash - # taken from llama.cpp - run: | - SHORT_HASH="$(git rev-parse --short=7 HEAD)" - DEPTH="$(git rev-list --count HEAD)" - if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then - echo "name=dev-${DEPTH}-${SHORT_HASH}" >> $GITHUB_OUTPUT - else - SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-') - echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT - fi + run: . .github/workflows/tag_version.bash - name: Clean temporary artifacts # msvc sometimes produces .ilk files, which are used for linking only @@ -286,16 +259,7 @@ jobs: - name: Determine tag name id: tag shell: bash - # taken from llama.cpp - run: | - SHORT_HASH="$(git rev-parse --short=7 HEAD)" - DEPTH="$(git rev-list --count HEAD)" - if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then - echo "name=dev-${DEPTH}-${SHORT_HASH}" >> $GITHUB_OUTPUT - else - SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-') - echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT - fi + run: . .github/workflows/tag_version.bash - name: Install Dependencies run: sudo apt update && sudo apt -y install unar @@ -360,16 +324,7 @@ jobs: - name: Determine tag name id: tag shell: bash - # taken from llama.cpp - run: | - SHORT_HASH="$(git rev-parse --short=7 HEAD)" - DEPTH="$(git rev-list --count HEAD)" - if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then - echo "name=dev-${DEPTH}-${SHORT_HASH}" >> $GITHUB_OUTPUT - else - SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-') - echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT - fi + run: . .github/workflows/tag_version.bash - name: Download artifacts id: download-artifact diff --git a/.github/workflows/tag_version.bash b/.github/workflows/tag_version.bash new file mode 100755 index 0000000..329e48a --- /dev/null +++ b/.github/workflows/tag_version.bash @@ -0,0 +1,10 @@ +# taken from llama.cpp +# needs BRANCH_NAME set +SHORT_HASH="$(git rev-parse --short=7 HEAD)" +DEPTH="$(git rev-list --count HEAD)" +if [[ "${BRANCH_NAME}" == "master" ]]; then + echo "name=dev-${DEPTH}-${SHORT_HASH}" >> $GITHUB_OUTPUT +else + SAFE_NAME=$(echo "${BRANCH_NAME}" | tr '/' '-') + echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT +fi