Skip to content

Commit

Permalink
update build and version to 1.0.0-rc.2
Browse files Browse the repository at this point in the history
  • Loading branch information
patrislav committed Feb 16, 2024
1 parent b1fd248 commit 681886e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ENV CONFIG=./etc/waas-auth.conf
CMD ["make", "run"]


FROM ghcr.io/0xsequence/eiffel:v0.2.0@sha256:b696e86ce1b42c14503973a7dc2893b08dc44ce5cbf41242b8afe6abe3b12077
FROM ghcr.io/0xsequence/eiffel:v0.3.0@sha256:d4aa946d7eb587e0554123efc3eaa5830a1428b0325ea239fe489e372f573dfe

ARG ENV_ARG=dev2

Expand Down
13 changes: 3 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,7 @@ TOP := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
SHELL = bash -o pipefail
TEST_FLAGS ?= -v

GITTAG ?= $(shell git describe --exact-match --tags HEAD 2>/dev/null || :)
GITBRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null || :)
LONGVERSION ?= $(shell git describe --tags --long --abbrev=8 --always HEAD)$(echo -$GITBRANCH | tr / - | grep -v '\-master' || :)
VERSION ?= $(if $(GITTAG),$(GITTAG),$(LONGVERSION))
GITCOMMIT ?= $(shell git log -1 --date=iso --pretty=format:%H)
GITCOMMITDATE ?= $(shell git log -1 --date=iso --pretty=format:%cd)
GITCOMMITAUTHOR ?= $(shell git log -1 --date=iso --pretty="format:%an")

VERSION := $(shell grep -o 'VERSION = "[^"]*' $(TOP)/version.go | cut -d'"' -f2)

define run
@go run github.com/goware/rerun/cmd/rerun -watch ./ -ignore vendor bin tests data/schema -run \
Expand Down Expand Up @@ -63,7 +56,7 @@ test: test-clean
test-clean:
GOGC=off go clean -testcache

eif:
eif: clean
mkdir -p bin
docker build --platform linux/amd64 --build-arg ENV_ARG=next -t waas-authenticator-builder .
docker run --platform linux/amd64 -v bin:/out waas-authenticator-builder
docker run --platform linux/amd64 -v $(TOP)/bin:/out waas-authenticator-builder waas-auth.$(VERSION)
2 changes: 1 addition & 1 deletion version.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package waasauthenticator

const VERSION = "1.0.0-rc.1"
const VERSION = "1.0.0-rc.2"

0 comments on commit 681886e

Please sign in to comment.