Skip to content

Commit 1b72192

Browse files
fe2sfe2s
authored
Merge master into branch-2.4 (#292)
* bump version 2.6.0
1 parent eddeb31 commit 1b72192

File tree

5 files changed

+129
-24
lines changed

5 files changed

+129
-24
lines changed

‎.circleci.settings.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<settings>
2+
<servers>
3+
<server>
4+
<id>ossrh</id>
5+
<username>${env.OSSRH_USERNMAE}</username>
6+
<password>${env.OSSRH_PASSWORD}</password>
7+
</server>
8+
<server>
9+
<id>gpg.passphrase</id>
10+
<passphrase>${env.GPG_PASSPHRASE}</passphrase>
11+
</server>
12+
</servers>
13+
</settings>

‎.circleci/config.yml

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
version: 2.1
2+
commands:
3+
early_return_for_forked_pull_requests:
4+
description: >-
5+
If this build is from a fork, stop executing the current job and return success.
6+
This is useful to avoid steps that will fail due to missing credentials.
7+
steps:
8+
- run:
9+
name: Early return if this build is from a forked PR
10+
command: |
11+
if [ -n "$CIRCLE_PR_NUMBER" ]; then
12+
echo "Nothing to do for forked PRs, so marking this step successful"
13+
circleci step halt
14+
fi
15+
16+
executors:
17+
linux-8-jdk:
18+
docker:
19+
- image: circleci/openjdk:8-jdk
20+
21+
jobs:
22+
build:
23+
parameters:
24+
os:
25+
type: executor
26+
27+
executor: << parameters.os >>
28+
29+
working_directory: ~/repo
30+
31+
environment:
32+
JVM_OPTS: -Xmx3200m
33+
TERM: dumb
34+
35+
steps:
36+
- checkout
37+
38+
# Download and cache dependencies
39+
- restore_cache:
40+
keys:
41+
- spark-redis-{{ checksum "pom.xml" }}
42+
43+
- run: mvn dependency:go-offline
44+
45+
- save_cache:
46+
paths:
47+
- ~/.m2
48+
key: spark-redis-{{ checksum "pom.xml" }}
49+
50+
- run:
51+
name: install Redis
52+
command: |
53+
sudo apt-get -y update
54+
sudo apt-get install -y gcc-8 g++-8 libssl-dev
55+
wget http://download.redis.io/releases/redis-6.0.10.tar.gz
56+
tar -xzvf redis-6.0.10.tar.gz
57+
make -C redis-6.0.10 -j4 BUILD_TLS=yes
58+
export PATH=$PWD/redis-6.0.10/src:$PATH
59+
60+
- run:
61+
name: Run Test
62+
command: |
63+
export PATH=$PWD/redis-6.0.10/src:$PATH
64+
make test
65+
66+
- run:
67+
name: switch scala to 2.12
68+
command: |
69+
sleep 5s # let redis exit gracefully (we use kill, not kill -9 in makefile)
70+
ps aux | grep redis
71+
./dev/change-scala-version.sh 2.12 # switch to scala 2.12
72+
73+
- run:
74+
name: Run Test with scala 2.12
75+
command: |
76+
export PATH=$PWD/redis-6.0.10/src:$PATH
77+
make test
78+
79+
- early_return_for_forked_pull_requests
80+
81+
- run: bash <(curl -s https://codecov.io/bash) -t ${CODECOV_TOKEN}
82+
83+
- run: mvn -s .circleci.settings.xml -DskipTests deploy
84+
85+
workflows:
86+
all-jdks:
87+
jobs:
88+
- build:
89+
matrix:
90+
parameters:
91+
os: [linux-8-jdk]

‎.travis.yml

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

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[![license](https://img.shields.io/github/license/RedisLabs/spark-redis.svg)](https://github.com/RedisLabs/spark-redis)
2-
[![GitHub issues](https://img.shields.io/github/release/RedisLabs/spark-redis.svg)](https://github.com/RedisLabs/spark-redis/releases/latest)
3-
[![Build Status](https://travis-ci.org/RedisLabs/spark-redis.svg)](https://travis-ci.org/RedisLabs/spark-redis)
2+
[![Release](https://img.shields.io/github/release/RedisLabs/spark-redis.svg)](https://github.com/RedisLabs/spark-redis/releases/latest)
3+
[![CircleCI](https://circleci.com/gh/RedisLabs/spark-redis/tree/master.svg?style=svg)](https://circleci.com/gh/RedisLabs/spark-redis/tree/master)
44
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.redislabs/spark-redis_2.11/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.redislabs/spark-redis_2.11)
55
[![Javadocs](https://www.javadoc.io/badge/com.redislabs/spark-redis_2.11.svg)](https://www.javadoc.io/doc/com.redislabs/spark-redis_2.11)
6-
[![Gitter](https://badges.gitter.im/RedisLabs/spark-redis.svg)](https://gitter.im/RedisLabs/spark-redis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
7-
<!--[![Codecov](https://codecov.io/gh/RedisLabs/spark-redis/branch/master/graph/badge.svg)](https://codecov.io/gh/RedisLabs/spark-redis)-->
6+
[![Discord](https://img.shields.io/discord/697882427875393627?style=flat-square)](https://discord.gg/Bjt6TcgV)
7+
[![Codecov](https://codecov.io/gh/RedisLabs/spark-redis/branch/master/graph/badge.svg)](https://codecov.io/gh/RedisLabs/spark-redis)
88

99
# Spark-Redis
1010
A library for reading and writing data in [Redis](http://redis.io) using [Apache Spark](http://spark.apache.org/).
@@ -22,7 +22,7 @@ The master branch contains the recent development for the next release.
2222

2323
| Spark-Redis | Spark | Redis | Supported Scala Versions |
2424
| ----------------------------------------------------------------| ------------- | ---------------- | ------------------------ |
25-
| [2.4](https://github.com/RedisLabs/spark-redis/tree/branch-2.4) | 2.4.x | >=2.9.0 | 2.11, 2.12 |
25+
| [2.4, 2.5, 2.6](https://github.com/RedisLabs/spark-redis/tree/branch-2.4) | 2.4.x | >=2.9.0 | 2.11, 2.12 |
2626
| [2.3](https://github.com/RedisLabs/spark-redis/tree/branch-2.3) | 2.3.x | >=2.9.0 | 2.11 |
2727
| [1.4](https://github.com/RedisLabs/spark-redis/tree/branch-1.4) | 1.4.x | | 2.10 |
2828

‎pom.xml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.redislabs</groupId>
55
<artifactId>spark-redis_2.11</artifactId>
6-
<version>2.5.0-SNAPSHOT</version>
6+
<version>2.6.0-SNAPSHOT</version>
77
<name>Spark-Redis</name>
88
<description>A Spark library for Redis</description>
99
<url>http://github.com/RedisLabs/spark-redis</url>
@@ -67,6 +67,25 @@
6767

6868
<build>
6969
<plugins>
70+
<plugin>
71+
<groupId>org.jacoco</groupId>
72+
<artifactId>jacoco-maven-plugin</artifactId>
73+
<version>0.8.5</version>
74+
<executions>
75+
<execution>
76+
<goals>
77+
<goal>prepare-agent</goal>
78+
</goals>
79+
</execution>
80+
<execution>
81+
<id>report</id>
82+
<phase>test</phase>
83+
<goals>
84+
<goal>report</goal>
85+
</goals>
86+
</execution>
87+
</executions>
88+
</plugin>
7089
<plugin>
7190
<groupId>net.alchim31.maven</groupId>
7291
<artifactId>scala-maven-plugin</artifactId>

0 commit comments

Comments
 (0)