diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index c0901db..3bac158 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -75,8 +75,6 @@ jobs: - name: Make a new latest tag and force push it if: ${{ steps.get_version.outputs.new_tag != 'false' }} run: | - git fetch --tags - git checkout ${{ github.ref }} git tag -f latest ${{ steps.get_version.outputs.new_tag }} git push origin latest --force diff --git a/.version b/.version index be38891..38f8e88 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -v1.1.8 +dev diff --git a/Makefile b/Makefile index 2e1b54f..02f2c35 100644 --- a/Makefile +++ b/Makefile @@ -54,16 +54,23 @@ test: ## Run test build: ## Run build $(eval GOLLAMA_VERSION := $(shell if [ -z "$(GOLLAMA_VERSION)" ]; then echo "dev"; else echo $(GOLLAMA_VERSION); fi)) + echo $(GOLLAMA_VERSION) > .version LDFLAGS="-X github.com/sammcj/gollama/cmd.Version=$(GOLLAMA_VERSION)" @echo "Building with version: $(GOLLAMA_VERSION)" go build -v $(LDFLAGS) @echo "Build completed, run ./gollama" ci: ## build for linux and macOS + # generate version + $(eval GOLLAMA_VERSION := $(shell if [ -z "$(GOLLAMA_VERSION)" ]; then echo "dev"; else echo $(GOLLAMA_VERSION); fi)) + LDFLAGS="-X github.com/sammcj/gollama/cmd.Version=$(GOLLAMA_VERSION)" + @echo "Building with version: $(GOLLAMA_VERSION)" + mkdir -p ./dist/macos ./dist/linux_amd64 ./dist/linux_arm64 - GOOS=darwin GOARCH=arm64 go build -o ./dist/macos/ - GOOS=linux GOARCH=amd64 go build -o ./dist/linux_amd64/ - GOOS=linux GOARCH=arm64 go build -o ./dist/linux_arm64/ + GOOS=darwin GOARCH=arm64 go build -v $(LDFLAGS) -o ./dist/macos/ + GOOS=linux GOARCH=amd64 go build -v $(LDFLAGS) -o ./dist/linux_amd64/ + GOOS=linux GOARCH=arm64 go build -v $(LDFLAGS) -o ./dist/linux_arm64/ + # zip up each build zip -r gollama-macos.zip ./dist/macos/gollama zip -r gollama-linux-amd64.zip ./dist/linux_amd64/gollama