refactor tag nameing and update
Some checks failed
ContinuousDelivery / linux-ubuntu (push) Has been cancelled
ContinuousDelivery / windows (windows-2022, ) (push) Has been cancelled
ContinuousDelivery / windows (windows-2022, asan) (push) Has been cancelled
ContinuousIntegration / linux (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
ContinuousIntegration / macos (push) Has been cancelled
ContinuousIntegration / windows (push) Has been cancelled
ContinuousDelivery / release (push) Has been cancelled

This commit is contained in:
Green Sky
2025-11-01 22:26:14 +01:00
parent c42257d2d5
commit 88275ad0da
2 changed files with 19 additions and 30 deletions

View File

@@ -17,9 +17,10 @@ jobs:
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v5
with: with:
submodules: recursive submodules: recursive
fetch-depth: 0
- name: Install Dependencies - name: Install Dependencies
run: sudo apt update && sudo apt -y install libsodium-dev run: sudo apt update && sudo apt -y install libsodium-dev
@@ -33,15 +34,7 @@ jobs:
- name: Determine tag name - name: Determine tag name
id: tag id: tag
shell: bash shell: bash
# taken from llama.cpp run: . .github/workflows/tag_version.bash
run: |
SHORT_HASH="$(git rev-parse --short=7 HEAD)"
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
else
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
fi
- name: Compress artifacts - name: Compress artifacts
shell: bash shell: bash
@@ -68,9 +61,10 @@ jobs:
os: ['windows-2022'] os: ['windows-2022']
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v5
with: with:
submodules: recursive submodules: recursive
fetch-depth: 0
- name: Restore vcpkg cache - name: Restore vcpkg cache
id: vcpkg-cache id: vcpkg-cache
@@ -99,15 +93,7 @@ jobs:
- name: Determine tag name - name: Determine tag name
id: tag id: tag
shell: bash shell: bash
# taken from llama.cpp run: . .github/workflows/tag_version.bash
run: |
SHORT_HASH="$(git rev-parse --short=7 HEAD)"
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
else
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
fi
- name: Clean temporary artifacts - name: Clean temporary artifacts
# msvc sometimes produces .ilk files, which are used for linking only # msvc sometimes produces .ilk files, which are used for linking only
@@ -144,22 +130,15 @@ jobs:
contents: write contents: write
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v5
with: with:
submodules: recursive submodules: recursive
fetch-depth: 0
- name: Determine tag name - name: Determine tag name
id: tag id: tag
shell: bash shell: bash
# taken from llama.cpp run: . .github/workflows/tag_version.bash
run: |
SHORT_HASH="$(git rev-parse --short=7 HEAD)"
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
else
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
fi
- name: Download artifacts - name: Download artifacts
id: download-artifact id: download-artifact

10
.github/workflows/tag_version.bash vendored Executable file
View File

@@ -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