make tag name better + new build
Some checks failed
ContinuousDelivery / windows (push) Has been cancelled
ContinuousDelivery / release (push) Has been cancelled
ContinuousIntegration / windows (push) Has been cancelled

This commit is contained in:
Green Sky 2024-09-19 17:00:01 +02:00
parent be2885e31d
commit bb5f94446e
No known key found for this signature in database

View File

@ -11,47 +11,6 @@ env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
jobs:
#linux-ubuntu:
# timeout-minutes: 10
# runs-on: ubuntu-20.04
# steps:
# - uses: actions/checkout@v4
# - name: Configure CMake
# run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
# - name: Build
# run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
# - name: Determine tag name
# id: tag
# shell: bash
# # taken from llama.cpp
# run: |
# SHORT_HASH="$(git rev-parse --short=7 HEAD)"
# if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
# echo "name=${SHORT_HASH}" >> $GITHUB_OUTPUT
# else
# SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
# echo "name=${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
# fi
# - name: Compress artifacts
# shell: bash
# run: |
# tar -czvf ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu20.04-x86_64.tar.gz -C ${{github.workspace}}/build/bin/ .
# - uses: actions/upload-artifact@v4
# with:
# # TODO: simpler name?
# name: ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu20.04-x86_64
# # TODO: do propper packing
# path: |
# ${{github.workspace}}/${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu20.04-x86_64.tar.gz
windows:
timeout-minutes: 15
@ -78,10 +37,10 @@ jobs:
run: |
SHORT_HASH="$(git rev-parse --short=7 HEAD)"
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
echo "name=${SHORT_HASH}" >> $GITHUB_OUTPUT
echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
else
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
echo "name=${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
fi
- name: Compress artifacts
@ -120,10 +79,10 @@ jobs:
run: |
SHORT_HASH="$(git rev-parse --short=7 HEAD)"
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
echo "name=${SHORT_HASH}" >> $GITHUB_OUTPUT
echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
else
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
echo "name=${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
fi
- name: Download artifacts
@ -140,8 +99,8 @@ jobs:
run: |
gh release create "$tag" \
--repo="$GITHUB_REPOSITORY" \
--title="nightly ${tag#v}" \
--notes="nightly build" \
--title="${tag#v}" \
--notes="preview build of the latest commit" \
--prerelease
- name: Upload artifacts