Fix workflow commit hash

This commit is contained in:
Vadim Vetrov 2025-01-04 14:01:10 +03:00
parent fff2309863
commit 60e33318cb
No known key found for this signature in database
GPG Key ID: E8A308689D7A73A5
2 changed files with 6 additions and 5 deletions

View File

@ -32,11 +32,12 @@ jobs:
run: | run: |
echo "version=$(cat Makefile | grep "PKG_VERSION :=" | sed 's/PKG_VERSION := //')" >> $GITHUB_OUTPUT echo "version=$(cat Makefile | grep "PKG_VERSION :=" | sed 's/PKG_VERSION := //')" >> $GITHUB_OUTPUT
echo "release=$(cat Makefile | grep "PKG_RELEASE :=" | sed 's/PKG_RELEASE := //')" >> $GITHUB_OUTPUT echo "release=$(cat Makefile | grep "PKG_RELEASE :=" | sed 's/PKG_RELEASE := //')" >> $GITHUB_OUTPUT
if [[ "${{ github.event_name }}" != "pull_request" ]]; then
echo "sha=$(echo ${GITHUB_SHA::7})" >> $GITHUB_OUTPUT if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then
else GITHUB_SHA=$(cat $GITHUB_EVENT_PATH | jq -r .pull_request.head.sha)
echo "sha=$(gh api repos/$REPO/commits/main --jq '.sha[:7]')" >> $GITHUB_OUTPUT
fi fi
echo "sha=$(echo ${GITHUB_SHA::7})" >> $GITHUB_OUTPUT
cat $GITHUB_OUTPUT
build-static: build-static:
needs: prepare needs: prepare

View File

@ -74,7 +74,7 @@ prepare_dirs:
mkdir -p $(DEPSDIR) mkdir -p $(DEPSDIR)
$(LIBCYCLONE): $(LIBCYCLONE):
$(MAKE) -C deps/cyclone $(MAKE) -C deps/cyclone CFLAGS="$(CFLAGS)"
mkdir -p $(DEPSDIR)/lib mkdir -p $(DEPSDIR)/lib
cp deps/cyclone/libcyclone.a $(DEPSDIR)/lib/libcyclone.a cp deps/cyclone/libcyclone.a $(DEPSDIR)/lib/libcyclone.a