Skip to content

Commit 566edc1

Browse files
committed
update circleci, revert back switching to Scala 2.12, don't install gcc-8 as gcc-10 in publish flow
1 parent f04fee1 commit 566edc1

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

.circleci/config.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,11 @@ jobs:
6969
export PATH=$PWD/redis-6.0.10/src:$PATH
7070
make test
7171
- run:
72-
name: gracefully kill redis
72+
name: switch scala to 2.12
7373
command: |
7474
sleep 5s # let redis exit gracefully (we use kill, not kill -9 in makefile)
7575
ps aux | grep redis
76+
./dev/change-scala-version.sh 2.12 # switch to scala 2.12
7677
- run:
7778
name: Run Test with scala 2.12
7879
command: |
@@ -111,7 +112,7 @@ jobs:
111112
name: install Redis
112113
command: |
113114
sudo apt-get -y update
114-
sudo apt-get install -y gcc-8 g++-8 libssl-dev
115+
sudo apt-get install -y libssl-dev
115116
wget http://download.redis.io/releases/redis-6.0.10.tar.gz
116117
tar -xzvf redis-6.0.10.tar.gz
117118
make -C redis-6.0.10 -j`nproc` BUILD_TLS=yes

0 commit comments

Comments
 (0)