Skip to content

Commit

Permalink
nginx moved to GitHub.
Browse files Browse the repository at this point in the history
  • Loading branch information
thresheek committed Sep 14, 2024
1 parent b2c2338 commit 5a7b586
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
BRANCH= $(shell hg branch)
BRANCH?= $(shell git rev-parse --abbrev-ref HEAD)

ifeq (,$(findstring stable,$(BRANCH)))
FLAVOR= mainline
Expand All @@ -15,7 +15,7 @@ CURRENT_VERSION_STRING_NJS=$(shell curl -fs https://version.nginx.com/njs/$(FLAV
CURRENT_VERSION_NJS=$(word 2,$(subst +, ,$(word 1,$(subst -, ,$(CURRENT_VERSION_STRING_NJS)))))
CURRENT_RELEASE_NJS=$(word 2,$(subst -, ,$(CURRENT_VERSION_STRING_NJS)))

VERSION?= $(shell curl -fs https://hg.nginx.org/nginx/raw-file/$(BRANCH)/src/core/nginx.h | fgrep 'define NGINX_VERSION' | cut -d '"' -f 2)
VERSION?= $(shell curl -Lfs https://github.com/nginx/nginx/raw/$(BRANCH)/src/core/nginx.h | fgrep 'define NGINX_VERSION' | cut -d '"' -f 2)
RELEASE?= 1

VERSION_NJS?= $(shell curl -Lfs https://github.com/nginx/njs/raw/master/src/njs.h | fgrep -m 1 'define NJS_VERSION' | cut -d '"' -f 2)
Expand Down Expand Up @@ -131,12 +131,12 @@ release-njs: version-check-njs njs-$(VERSION_NJS).tar.gz
}

revert:
@hg revert -v contrib/src/nginx/ docs/ $(BASE_MAKEFILES) contrib/src/njs/
@git checkout -- contrib/src/nginx/ docs/ $(BASE_MAKEFILES) contrib/src/njs/

commit:
@hg commit -vm 'Updated nginx to $(VERSION)'
@git commit -am 'Updated nginx to $(VERSION)'

tag:
@hg tag -v $(VERSION)-$(RELEASE)
@git tag -a $(VERSION)-$(RELEASE)

.PHONY: version-check version-check-njs release release-njs revert commit tag

0 comments on commit 5a7b586

Please sign in to comment.