Browse code

bioc version

Guangchuang Yu authored on 28/10/2021 05:05:36
Showing2 changed files

... ...
@@ -1,8 +1,7 @@
1 1
 PKGNAME := $(shell sed -n "s/Package: *\([^ ]*\)/\1/p" DESCRIPTION)
2 2
 PKGVERS := $(shell sed -n "s/Version: *\([^ ]*\)/\1/p" DESCRIPTION)
3 3
 PKGSRC  := $(shell basename `pwd`)
4
-BIOCOLD := RELEASE_3_13
5
-BIOCCUR := RELEASE_3_14
4
+BIOCVER := RELEASE_3_14
6 5
 
7 6
 
8 7
 all: rd check clean
... ...
@@ -72,11 +71,11 @@ giteeinit:
72 71
 	git remote add gitee git@gitee.com:GuangchuangYu/$(PKGNAME).git;\
73 72
 	git fetch --all
74 73
 
75
-rmoldrelease:
76
-	git branch -D $(BIOCOLD)
74
+rmrelease:
75
+	git branch -D $(BIOCVER)
77 76
 
78 77
 release:
79
-	git checkout $(BIOCCUR);\
78
+	git checkout $(BIOCVER);\
80 79
 	git fetch --all
81 80
 
82 81
 update:
... ...
@@ -1,11 +1,19 @@
1
-make update;\
2
-sed -i 's/RELEASE_3_13/RELEASE_3_14/g' Makefile;\
3
-sed -i 's/RELEASE_3_12/RELEASE_3_13/g' Makefile;\
1
+## rm old release branch
2
+make rmrelease
4 3
 
5
-git add .;\
6
-git commit -m 'update bioc version';\
4
+## merge change from bioc
5
+make update
6
+
7
+## set current release version
8
+sed -i 's/RELEASE_3_13/RELEASE_3_14/g' Makefile
9
+
10
+## commit and push to github
11
+git add .
12
+git commit -m 'update bioc version'
7 13
 git push
8 14
 
9
-make rmoldrelease;\
10
-make release;\
15
+## pull current release branch
16
+make release
17
+
18
+## go back to master branch
11 19
 git checkout master