Skip to content

Commit

Permalink
fix apt install (#3906)
Browse files Browse the repository at this point in the history
  • Loading branch information
zhoucheng361 authored Jul 17, 2023
1 parent edb40b8 commit c632c57
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 12 deletions.
5 changes: 2 additions & 3 deletions .github/scripts/start_meta_engine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,13 @@ start_meta_engine(){
if [ "$meta" == "mysql" ]; then
sudo /etc/init.d/mysql start
elif [ "$meta" == "redis" ]; then
sudo apt-get install -y redis-tools redis-server
sudo .github/scripts/apt_install.sh redis-tools redis-server
elif [ "$meta" == "tikv" ]; then
[[ ! -d tcli ]] && git clone https://github.com/c4pt0r/tcli
cd tcli && make
sudo cp bin/tcli /usr/local/bin
cd -
retry install_tikv

elif [ "$meta" == "badger" ]; then
sudo go get github.com/dgraph-io/badger/v3
elif [ "$meta" == "mariadb" ]; then
Expand All @@ -109,7 +108,7 @@ start_meta_engine(){
retry install_tidb
mysql -h127.0.0.1 -P4000 -uroot -e "set global tidb_enable_noop_functions=1;"
elif [ "$meta" == "etcd" ]; then
sudo apt install etcd
sudo .github/scripts/apt_install.sh etcd
elif [ "$meta" == "fdb" ]; then
docker run --name fdb --rm -d -p 4500:4500 foundationdb/foundationdb:6.3.23
sleep 5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/chaos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

- name: Build
run: |
sudo apt-get update && sudo apt-get install -y musl-tools upx-ucl
sudo .github/scripts/apt_install.sh musl-tools upx-ucl
export STATIC=1
make juicefs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/encoding_mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
run: |
sudo /etc/init.d/mysql start
sudo chmod 777 /var
sudo apt install attr
sudo .github/scripts/apt_install.sh attr
- name: Test mysql gbk support with new client
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fsrand.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Install tool
run: |
sudo apt install attr
sudo .github/scripts/apt_install.sh attr
sudo pip install xattr
sudo pip install minio
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/integrationtests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ jobs:
- name: Fstests
run: |
sudo apt-get install -y libacl1-dev
sudo apt-get install -y attr
sudo .github/scripts/apt_install.sh libacl1-dev attr
sudo DURATION=60 make -C fstests fsx
sudo make -C fstests xattrs
sudo make -C fstests flock
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/ltpfs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ jobs:
- name: LTP FS
timeout-minutes: 50
run: |
sudo apt-get install -y libaio-dev libacl1-dev
sudo apt-get install -y attr
sudo .github/scripts/apt_install.sh libaio-dev libacl1-dev attr
wget -O ltp.tar.gz https://github.com/linux-test-project/ltp/archive/refs/tags/20210927.tar.gz
mkdir ltp
tar -xvf ltp.tar.gz -C ltp --strip-components 1
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/ltpsyscalls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ jobs:
- name: Install LTP Syscalls
run: |
sudo apt-get install -y libaio-dev libacl1-dev
sudo apt-get install -y attr
sudo .github/scripts/apt_install.sh libaio-dev libacl1-dev attr
wget -O ltp.tar.gz https://github.com/linux-test-project/ltp/archive/refs/tags/20210927.tar.gz
mkdir ltp
tar -xvf ltp.tar.gz -C ltp --strip-components 1
Expand Down

0 comments on commit c632c57

Please sign in to comment.