Skip to content

Commit a9ae37d

Browse files
committed
[ci][fix] Use scripts dir for build base
1 parent caa9996 commit a9ae37d

File tree

11 files changed

+16
-163
lines changed

11 files changed

+16
-163
lines changed

.github/workflows/bak/ci-build.yml.bak

Lines changed: 0 additions & 125 deletions
This file was deleted.

.github/workflows/bak/issue-action.yml.bak

Lines changed: 0 additions & 16 deletions
This file was deleted.

.github/workflows/ci-build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,9 @@ jobs:
7575
exit -1
7676
fi
7777
78-
tar -czvf dingofs.tar.gz -C docker/rocky9 dingofs
79-
tar -czvf dingofs-latest.tar.gz --exclude='dingofs/build' --exclude='dingofs/mds' --exclude='dingofs/metaserver' --exclude='dingofs/tools' -C docker/rocky9 dingofs
78+
tar -czvf dingofs.tar.gz -C scripts/docker/rocky9 dingofs
8079
# check size of tar file
8180
ls -lh dingofs.tar.gz
82-
ls -lh dingofs-latest.tar.gz
8381
8482
echo "DingoFS Build finished"
8583
EOF

.github/workflows/docker-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124

125125
- name: Extract artifact
126126
if: steps.check-event.outputs.continue == 'true'
127-
run: tar -xzvf dingofs.tar.gz -C docker/rocky9 && rm -f dingofs.tar.gz
127+
run: tar -xzvf dingofs.tar.gz -C scripts/docker/rocky9 && rm -f dingofs.tar.gz
128128

129129
- name: Set up Docker Buildx
130130
if: steps.check-event.outputs.continue == 'true'
@@ -152,7 +152,7 @@ jobs:
152152
if: ${{ steps.check-event.outputs.continue == 'true' && (env.BRANCH_NAME == 'main' || env.EVENT == 'tag') }}
153153
uses: docker/build-push-action@v6
154154
with:
155-
context: ./docker/rocky9
156-
file: ./docker/rocky9/Dockerfile
155+
context: ./scripts/docker/rocky9
156+
file: ./scripts/docker/rocky9/Dockerfile
157157
push: true
158158
tags: ${{ steps.meta-v2.outputs.tags }}

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ thirdparties/etcdclient/tmp/
8181
thirdparties/etcdclient/*.h
8282

8383
build/
84-
docker/rocky9/dingofs
84+
scripts/docker/rocky9/dingofs
8585

8686
dist/
8787
.cache

conf/dingo.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ global:
22
httpTimeout: 50000ms
33
rpcTimeout: 50000ms
44
rpcRetryTimes: 5
5-
maxChannelSize: 4
65
showError: false
7-
mds_api_version: 2
86

97
dingofs:
108
mdsAddr: 127.0.0.1:6900,127.0.0.1:6901,127.0.0.1:6902 # __DINGOADM_TEMPLATE__ ${cluster_mdsv2_addr} __DINGOADM_TEMPLATE__
File renamed without changes.
File renamed without changes.

scripts/install/file-build.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@ build_requirements() {
145145
echo "Error: Failed to update git submodules"
146146
exit 1
147147
fi
148-
g_etcdclient_root="thirdparties/etcdclient"
149-
(cd ${g_etcdclient_root} && make clean && make all)
150148
}
151149

152150
main() {

scripts/install/file-deploy-config.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ die() {
2222
}
2323

2424
############################ FUNCTIONS
25-
# usage: process_config_template conf/client.conf /path/to/dingofs/docker/rocky9/dingofs/confg/client.conf
25+
# usage: process_config_template conf/client.conf /path/to/dingofs/scripts/docker/rocky9/dingofs/confg/client.conf
2626
function usage() {
2727
echo "Usage: $0 [options]"
2828
echo "Options:"
@@ -100,8 +100,8 @@ get_options() {
100100
get_options "$@"
101101

102102
############################ MAIN()
103-
docker_prefix="$(pwd)/docker/$g_os"
104-
prefix="$docker_prefix/dingofs" # /path/to/dingofs/docker/rocky9/dingofs
103+
docker_prefix="$(pwd)/scripts/docker/$g_os"
104+
prefix="$docker_prefix/dingofs" # /path/to/dingofs/scripts/docker/rocky9/dingofs
105105
mkdir -p $prefix $prefix/conf $prefix/confv2
106106
install_pkg $prefix
107107
install_pkg $prefix etcd

0 commit comments

Comments
 (0)