Skip to content

Commit 44a98ac

Browse files
authored
Merge branch 'main' into issue_480
2 parents 1487b59 + 52cb602 commit 44a98ac

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

.gitpod.yml

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
github:
2-
prebuilds:
3-
master: false
4-
branches: false
5-
tasks:
6-
- name: install dependencies
7-
init: |
8-
sudo apt install cmake flex bison texinfo libreadline-dev -y
9-
sudo bash build.sh init
10-
echo -e "\033[32m\nDependency installed successfully\033[0m"
1+
coreDump:
2+
enabled: true
3+
image: oceanbase/miniob:latest

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ MESSAGE(STATUS "This is Project source dir " ${PROJECT_SOURCE_DIR})
77
MESSAGE(STATUS "This is PROJECT_BINARY_DIR dir " ${PROJECT_BINARY_DIR})
88

99
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
10-
SET(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH};${PROJECT_SOURCE_DIR}/deps/3rd/usr/local")
10+
SET(CMAKE_PREFIX_PATH "${PROJECT_SOURCE_DIR}/deps/3rd/usr/local;/usr/local;${CMAKE_PREFIX_PATH}")
1111
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
1212

1313
# 设置默认构建类型为 Debug

docker/Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ RUN apt-get update \
2424

2525
RUN apt-get install -y openssh-server
2626

27-
RUN git clone https://github.com/oceanbase/miniob /tmp/miniob \
27+
# Try cloning from GitHub, if it fails, use cnpmjs.org mirror
28+
RUN git clone https://github.com/oceanbase/miniob /tmp/miniob || \
29+
git clone https://githubfast.com/oceanbase/miniob /tmp/miniob \
2830
&& cd /tmp/miniob \
2931
&& THIRD_PARTY_INSTALL_PREFIX=/usr/local bash build.sh init \
3032
&& mkdir -p /root/docker/bin \

0 commit comments

Comments
 (0)