Skip to content

Commit 97efc02

Browse files
authored
Merge branch 'master' into credentials
2 parents 96a3f2a + 0560ada commit 97efc02

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

.github/workflows/integration.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ jobs:
3030
with:
3131
java-version: '8'
3232
distribution: 'temurin'
33-
- name: stunnel
33+
- name: System setup
3434
run: |
35-
sudo apt-get update
36-
sudo apt-get install -y stunnel make
35+
sudo apt update
36+
sudo apt install -y stunnel make
3737
make system-setup
3838
- name: Cache dependencies
3939
uses: actions/cache@v2
@@ -42,19 +42,19 @@ jobs:
4242
~/.m2/repository
4343
/var/cache/apt
4444
key: jedis-${{hashFiles('**/pom.xml')}}
45-
- name: mvn offline
45+
- name: Maven offline
4646
run: |
4747
mvn -q dependency:go-offline
48-
- name: run tests
48+
- name: Run tests
4949
run: |
5050
TEST="" make test
5151
env:
5252
JVM_OPTS: -Xmx3200m
5353
TERM: dumb
5454
- name: redismod docker
5555
run: docker run -p 52567:6379 -d redislabs/redismod:edge
56-
- name: run tests
56+
- name: Run tests
5757
run: mvn -DmodulesDocker="localhost:52567" -Dtest="redis.clients.jedis.modules.**" test
58-
- name: codecov
58+
- name: Codecov
5959
run: |
6060
bash <(curl -s https://codecov.io/bash)

Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -464,10 +464,7 @@ release:
464464
make stop
465465

466466
system-setup:
467-
sudo apt-get install -y gcc-8 g++-8
468-
cd /usr/bin ;\
469-
sudo ln -sf gcc-8 gcc ;\
470-
sudo ln -sf g++-8 g++
467+
sudo apt install -y gcc g++
471468
[ ! -e redis-git ] && git clone https://github.com/redis/redis.git --branch unstable --single-branch redis-git || true
472469
$(MAKE) -C redis-git clean
473470
$(MAKE) -C redis-git

0 commit comments

Comments
 (0)