From 0379f3d16df37ed1bc36f7dfe0b108ad416a5602 Mon Sep 17 00:00:00 2001 From: nic-chen Date: Wed, 3 Feb 2021 14:14:13 +0800 Subject: [PATCH 1/2] feat: add a tool to check version for release --- Makefile | 10 ++++-- utils/version-check.sh | 79 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 2 deletions(-) create mode 100755 utils/version-check.sh diff --git a/Makefile b/Makefile index 66b41b85fa..ac1f7e993b 100644 --- a/Makefile +++ b/Makefile @@ -103,8 +103,15 @@ endif .actions/openwhisk-utilities/scancode/scanCode.py --config .actions/ASF-Release.cfg ./ +### version-check: Check Apache APISIX Dashboard version for release +.PHONY: version-check +version-check: + ./utils/version-check.sh + + +### release-src: Package Apache APISIX Dashboard source codes for release .PHONY: release-src -release-src: +release-src: version-check git clean -Xdf rm -f ./.githash && git log --pretty=format:"%h" -1 > ./.githash tar -zcvf $(RELEASE_SRC).tgz \ @@ -128,4 +135,3 @@ release-src: mv $(RELEASE_SRC).tgz release/$(RELEASE_SRC).tgz mv $(RELEASE_SRC).tgz.asc release/$(RELEASE_SRC).tgz.asc mv $(RELEASE_SRC).tgz.sha512 release/$(RELEASE_SRC).tgz.sha512 - diff --git a/utils/version-check.sh b/utils/version-check.sh new file mode 100755 index 0000000000..df42f6708d --- /dev/null +++ b/utils/version-check.sh @@ -0,0 +1,79 @@ +#!/bin/sh + +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +ver=$1 + +red='\e[0;41m' +RED='\e[1;31m' +green='\e[0;32m' +GREEN='\e[1;32m' +NC='\e[0m' + + +# doc: apisix $ver + +matched=`grep "apisix-dashboard-v[0-9][0-9.]*" -r docs/` +expected=`grep "apisix-dashboard-v$ver" -r docs/` + +if [ "$matched" = "$expected" ]; then + echo -e "${green}passed: (doc) apisix $ver ${NC}" +else + echo -e "${RED}failed: (doc) apisix $ver ${NC}" 1>&2 + echo + echo "-----maybe wrong version-----" + echo "$matched" + exit 1 +fi + +matched=`grep "git clone -b v[0-9][0-9.]*" -r docs/` +expected=`grep "git clone -b v$ver" -r docs/` + +if [ "$matched" = "$expected" ]; then + echo -e "${green}passed: (doc) apisix $ver ${NC}" +else + echo -e "${RED}failed: (doc) apisix $ver ${NC}" 1>&2 + echo + echo "-----maybe wrong version-----" + echo "$matched" + exit 1 +fi + + +# api VERSION + +apiV=`cat api/VERSION` + +if [ "$apiV" != "$ver" ]; then + echo -e "${RED}failed: api/VERSION = $apiV not \"$ver\" ${NC}" 1>&2 + exit 1 +else + echo -e "${green}passed: api/VERSION = $ver ${NC}" +fi + + +# rockspec + +matched=`cat web/package.json | grep version | grep "$ver"` + +if [ -z "$matched" ]; then + echo "-----please check version \"$ver\" in web/package.json" + exit 1 +else + echo -e "${green}passed: version in web/package.json = $ver ${NC}" +fi From f8f3965ad122349e09590f644b6e4a75a509f965 Mon Sep 17 00:00:00 2001 From: nic-chen Date: Thu, 4 Feb 2021 21:42:05 +0800 Subject: [PATCH 2/2] fix review --- Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index ac1f7e993b..a5e216a219 100644 --- a/Makefile +++ b/Makefile @@ -103,15 +103,10 @@ endif .actions/openwhisk-utilities/scancode/scanCode.py --config .actions/ASF-Release.cfg ./ -### version-check: Check Apache APISIX Dashboard version for release -.PHONY: version-check -version-check: - ./utils/version-check.sh - - ### release-src: Package Apache APISIX Dashboard source codes for release .PHONY: release-src -release-src: version-check +release-src: + ./utils/version-check.sh ${VERSION} git clean -Xdf rm -f ./.githash && git log --pretty=format:"%h" -1 > ./.githash tar -zcvf $(RELEASE_SRC).tgz \