Skip to content

Commit 2ceec14

Browse files
marsishandsomeZhexuan Yang
authored andcommitted
fix compile error becase of proto (#65)
1 parent 24ed19b commit 2ceec14

File tree

2 files changed

+49
-38
lines changed

2 files changed

+49
-38
lines changed

pom.xml

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -115,37 +115,42 @@
115115
<artifactId>maven-resources-plugin</artifactId>
116116
<version>2.5</version>
117117
<executions>
118-
<execution>
119-
<id>copy-resources</id>
120-
<phase>validate</phase>
121-
<goals>
122-
<goal>copy-resources</goal>
123-
</goals>
124-
<configuration>
125-
<outputDirectory>${proto.folder}</outputDirectory>
126-
<resources>
127-
<resource>
128-
<directory>${basedir}/kvproto/include</directory>
129-
<includes>
130-
<include>**/gogoproto/**</include>
131-
<include>**/*.proto</include>
132-
</includes>
133-
</resource>
134-
<resource>
135-
<directory>${basedir}/kvproto/proto</directory>
136-
<filtering>true</filtering>
137-
</resource>
138-
<resource>
139-
<directory>${basedir}/raft-rs/proto</directory>
140-
<filtering>true</filtering>
141-
</resource>
142-
<resource>
143-
<directory>${basedir}/tipb/proto</directory>
144-
<filtering>true</filtering>
145-
</resource>
146-
</resources>
147-
</configuration>
148-
</execution>
118+
<execution>
119+
<id>copy-resources</id>
120+
<phase>validate</phase>
121+
<goals>
122+
<goal>copy-resources</goal>
123+
</goals>
124+
<configuration>
125+
<outputDirectory>${proto.folder}</outputDirectory>
126+
<resources>
127+
<resource>
128+
<directory>${basedir}/kvproto/include</directory>
129+
<includes>
130+
<include>**/gogoproto/**</include>
131+
</includes>
132+
</resource>
133+
<resource>
134+
<directory>${basedir}/kvproto/include</directory>
135+
<includes>
136+
<include>*.proto</include>
137+
</includes>
138+
</resource>
139+
<resource>
140+
<directory>${basedir}/kvproto/proto</directory>
141+
<filtering>true</filtering>
142+
</resource>
143+
<resource>
144+
<directory>${basedir}/raft-rs/proto/proto</directory>
145+
<filtering>true</filtering>
146+
</resource>
147+
<resource>
148+
<directory>${basedir}/tipb/proto</directory>
149+
<filtering>true</filtering>
150+
</resource>
151+
</resources>
152+
</configuration>
153+
</execution>
149154
</executions>
150155
</plugin>
151156

scripts/proto.sh

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,26 @@
1414
# limitations under the License.
1515
#
1616

17+
kvproto_hash=a4759dfe3753ce136d252578340bb2b33633ccfa
18+
19+
raft_rs_hash=14f007b443935aef51cb161c5b368b54fc8ed176
20+
21+
tipb_hash=c0b8f1a8c8395c319049600dc0efd278f1e26a0d
22+
1723
if [ -d "kvproto" ]; then
18-
cd kvproto; git pull origin master; cd ..
24+
cd kvproto; git fetch -p; git checkout ${kvproto_hash}; cd ..
1925
else
20-
git clone https://github.com/pingcap/kvproto
26+
git clone https://github.com/pingcap/kvproto; cd kvproto; git checkout ${kvproto_hash}; cd ..
2127
fi
2228

2329
if [ -d "raft-rs" ]; then
24-
cd raft-rs; git pull origin master; cd ..
30+
cd raft-rs; git fetch -p; git checkout ${raft_rs_hash}; cd ..
2531
else
26-
git clone https://github.com/pingcap/raft-rs
32+
git clone https://github.com/pingcap/raft-rs; cd raft-rs; git checkout ${raft_rs_hash}; cd ..
2733
fi
2834

2935
if [ -d "tipb" ]; then
30-
cd tipb; git pull origin master; cd ..
31-
else
32-
git clone https://github.com/pingcap/tipb
36+
cd tipb; git fetch -p; git checkout ${tipb_hash}; cd ..
37+
else
38+
git clone https://github.com/pingcap/tipb; cd tipb; git checkout ${tipb_hash}; cd ..
3339
fi

0 commit comments

Comments
 (0)