Skip to content

Commit

Permalink
Move version.json into internal (#239)
Browse files Browse the repository at this point in the history
  • Loading branch information
pskrbasu authored Mar 6, 2024
1 parent 6e0b61a commit 00453df
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/01-powerpipe-pre-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Calculate version
id: calculate_version
run: |
VERSION_JSON=$(cat powerpipe/version.json)
VERSION_JSON=$(cat powerpipe/internal/version/version.json)
MAJOR=$(echo $VERSION_JSON | jq '.major')
MINOR=$(echo $VERSION_JSON | jq '.minor')
PATCH=$(echo $VERSION_JSON | jq '.patch')
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ GOLANG_CROSS_VERSION ?= v1.21.5

.PHONY: build
build:
$(eval MAJOR := $(shell cat version.json | jq '.major'))
$(eval MINOR := $(shell cat version.json | jq '.minor'))
$(eval PATCH := $(shell cat version.json | jq '.patch'))
$(eval MAJOR := $(shell cat internal/version/version.json | jq '.major'))
$(eval MINOR := $(shell cat internal/version/version.json | jq '.minor'))
$(eval PATCH := $(shell cat internal/version/version.json | jq '.patch'))
$(eval TIMESTAMP := $(shell date +%Y%m%d%H%M%S))

go build -o $(OUTPUT_DIR) -ldflags "-X main.version=$(MAJOR).$(MINOR).$(PATCH)-dev.$(TIMESTAMP)" .
Expand Down
File renamed without changes.

0 comments on commit 00453df

Please sign in to comment.