From 4fd8fd10f9ac8b1e3b84edbec5320b56adff107a Mon Sep 17 00:00:00 2001 From: mintsuki Date: Sun, 16 Jan 2022 06:34:15 +0100 Subject: [PATCH] build: Fix up version.sh --- .github/workflows/check.yml | 2 +- .github/workflows/release.yml | 2 +- version.sh | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index b2659e30..a962ddd4 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -12,7 +12,7 @@ jobs: uses: actions/checkout@v2 - name: Install dependencies - run: sudo apt-get update && sudo apt-get install git build-essential nasm curl mtools -y + run: sudo apt-get update && sudo apt-get install git build-essential autoconf nasm curl mtools -y - name: Build the bootloader run: ./autogen.sh && make all diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 43edb7a1..e3d03130 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: run: echo "BRANCH_NAME=$(echo "$TAG_NAME" | grep -o 'v[0-9]\+\.')0-branch" >> $GITHUB_ENV - name: Install dependencies - run: sudo apt-get update && sudo apt-get install git build-essential nasm gcc-mingw-w64 gcc-multilib curl mtools -y + run: sudo apt-get update && sudo apt-get install git build-essential autoconf nasm gcc-mingw-w64 gcc-multilib curl mtools -y - name: Regenerate run: NOCONFIGURE=yes ./autogen.sh diff --git a/version.sh b/version.sh index 5325cbc3..a4e061d3 100755 --- a/version.sh +++ b/version.sh @@ -1,3 +1,4 @@ #!/bin/sh -cat version 2>/dev/null || ( git describe --exact-match --tags `git log -n1 --pretty='%h'` 2>/dev/null || git log -n1 --pretty='%h' ) +[ -f version ] || ( git describe --exact-match --tags $(git log -n1 --pretty='%h') 2>/dev/null || git log -n1 --pretty='%h' ) | xargs printf '%s' +[ -f version ] && ( cat version 2>/dev/null ) | xargs printf '%s'