Fix package version

This commit is contained in:
tt2468 2021-08-28 23:28:00 -07:00
parent d7d6969092
commit 0b02b7453e

View File

@ -62,9 +62,9 @@ jobs:
echo "GIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV echo "GIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
echo "GIT_TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV echo "GIT_TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
if [ "${{ env.GIT_TAG }}" ] ; then \ if [ "${{ env.GIT_TAG }}" ] ; then \
VERSION="${{ env.GIT_TAG }}" ; \ VERSION="$(git describe --tags --abbrev=0)" ; \
else \ else \
VERSION="${{ env.GIT_HASH }}-git" ; \ VERSION="$(git rev-parse --short HEAD)-git" ; \
fi fi
echo "PACKAGE_VERSION=$VERSION" >> $GITHUB_ENV echo "PACKAGE_VERSION=$VERSION" >> $GITHUB_ENV
- name: 'Restore Cached Qt' - name: 'Restore Cached Qt'
@ -223,9 +223,9 @@ jobs:
echo "GIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV echo "GIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
echo "GIT_TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV echo "GIT_TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
if [ "${{ env.GIT_TAG }}" ] ; then \ if [ "${{ env.GIT_TAG }}" ] ; then \
VERSION="${{ env.GIT_TAG }}" ; \ VERSION="$(git describe --tags --abbrev=0)" ; \
else \ else \
VERSION="${{ env.GIT_HASH }}-git" ; \ VERSION="$(git rev-parse --short HEAD)-git" ; \
fi fi
echo "PACKAGE_VERSION=$VERSION" >> $GITHUB_ENV echo "PACKAGE_VERSION=$VERSION" >> $GITHUB_ENV
- name: 'Install prerequisites (Apt)' - name: 'Install prerequisites (Apt)'