From 624281b268eb65529c691c8a71d877a1088402ce Mon Sep 17 00:00:00 2001 From: Ned Bingham Date: Wed, 13 Nov 2024 16:11:04 -0500 Subject: [PATCH] fixing automation --- .github/workflows/release.yml | 1 + Makefile | 5 +++-- VERSION | 2 +- bin/ckt | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a8df77d..9c6b6f1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -127,6 +127,7 @@ jobs: - name: Upload Install Script if: matrix.os == 'macos-latest' uses: actions/upload-release-asset@v1 + continue-on-error: true with: upload_url: ${{ steps.get_release_info.outputs.url }} asset_path: "install.sh" diff --git a/Makefile b/Makefile index bbcd038..48e25b0 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,8 @@ MAINTAINER_EMAIL = "$(shell git config user.email)" all: version lib version: + @git fetch --tags --no-recurse-submodules + @git fetch origin $(shell git rev-list --tags --max-count=1) @git describe --tags --abbrev=0 | cut -c2- > VERSION linux: lib @@ -53,8 +55,7 @@ linux: lib mkdir -p debian touch debian/control echo "Package: loom" > lm-linux/DEBIAN/control - git fetch --tags --no-recurse-submodules - git describe --tags --abbrev=0 | sed 's/v\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)/\1.\2-\3/g' | xargs -I{} echo "Version: {}" >> lm-linux/DEBIAN/control + cat VERSION | sed 's/\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)/\1.\2-\3/g' | xargs -I{} echo "Version: {}" >> lm-linux/DEBIAN/control echo "Section: base" >> lm-linux/DEBIAN/control echo "Priority: optional" >> lm-linux/DEBIAN/control echo "Architecture: amd64" >> lm-linux/DEBIAN/control diff --git a/VERSION b/VERSION index 5eef0f1..a3f5a8e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.10.2 +0.10.3 diff --git a/bin/ckt b/bin/ckt index 2372a4c..df53a29 160000 --- a/bin/ckt +++ b/bin/ckt @@ -1 +1 @@ -Subproject commit 2372a4c7b61913add7dbf86f58a3b2f7e1f92021 +Subproject commit df53a29b51c23e5a26eb64805ac7afd14007df05