1.查看当前仓库地址
git remote show origin
3.git取消与远程仓库的连接
git remote remove origin
可以通过如下命令进行代码合并【注:pull=fetch+merge] 解决reject问题
git pull --rebase origin master
git init
git remote add origin https://gitee.com/xjpb/notes.git
1.初始化本地项目为git代码
进入项目目录,初始化
git init
2.添加文件到版本库
git add .
3.提交到仓库
git commit -m “填写提交信息”
4.关联远程仓库
git remote add origin https://gitee.com/xjpb/notes.git
5.推送到远程仓库
git push origin master
6.拉取远程仓库
git pull origin dev(远程分支名称)
7…gitignore无法忽略已经被托管的文件
git rm -r --cached 文件/文件夹名 # 删除已经托管的文件
git add . # 重新添加
git commit -m ‘’ # 重新提交
回退版本
git log
git revert -n 8b89621019c9adc6fc4d242cd41daeb13aeb9861
修改jdk环境
vim /etc/profile
source /etc/profile
mvn不能使用
解决方案:
1.不设置JAVA_HOME
2.将JRE_HOME设置成 /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.212.b04-0.el7_6.x86_64/jre
jekins 执行springboot项目shell命令
source /etc/profile
pid=$(ps x | grep “Chapter13-1.0-SNAPSHOT.jar” |grep -v grep |awk '{print KaTeX parse error: Expected 'EOF', got '}' at position 2: 1}̲') if [ -n "pid" ]; then
kill -9 $pid
fi
cd Chapter13
mvn clean package
cd target
pwd
BUILD_ID=dontkillMe
nohup java -jar Chapter13-1.0-SNAPSHOT.jar &
jekins 执行测试testng项目shell命令
source /etc/profile
cd Chapter12
mvn clean package
#获取id
result=
(
c
u
r
l
−
s
h
t
t
p
:
/
/
121.36.167.85
:
8080
/
j
o
b
/
t
e
s
t
/
l
a
s
t
B
u
i
l
d
/
b
u
i
l
d
N
u
m
b
e
r
−
−
u
s
e
r
r
o
o
t
:
r
o
o
t
)
m
k
d
i
r
/
h
o
m
e
/
j
e
k
e
n
s
/
a
p
a
c
h
e
−
t
o
m
c
a
t
−
8.0.23
/
w
e
b
a
p
p
s
/
R
O
O
T
/
(curl -s http://121.36.167.85:8080/job/test/lastBuild/buildNumber --user root:root) mkdir /home/jekens/apache-tomcat-8.0.23/webapps/ROOT/
(curl−shttp://121.36.167.85:8080/job/test/lastBuild/buildNumber−−userroot:root)mkdir/home/jekens/apache−tomcat−8.0.23/webapps/ROOT/result
#/var/lib/jenkins/workspace/test/Chapter12/
cp /var/lib/jenkins/workspace/test/Chapter12/test-output/index.html /home/jekens/apache-tomcat-8.0.23/webapps/ROOT/$result/index.html