Skip to content

Commit b0031ad

Browse files
committed
fix config.yaml
1 parent bf3faed commit b0031ad

File tree

3 files changed

+72
-12
lines changed

3 files changed

+72
-12
lines changed

.circleci/config.yml

Lines changed: 70 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- ~/.m2
2323
key: m2-{{ checksum "pom.xml" }}
2424

25-
- run: mvn clean install -DoutputDirectory=/tmp/artifacts
25+
- run: mvn clean install -DoutputDirectory=/tmp/artifacts && cp cassandra-{2.2,3.0,3.11,4,4.1}/target/cassandra-kerberos-*.jar /tmp/artifacts
2626

2727
- store_artifacts:
2828
path: /tmp/artifacts
@@ -46,7 +46,7 @@ jobs:
4646
- m2-{{ checksum "pom.xml" }}
4747
- m2-
4848

49-
- run: mvn clean install -DoutputDirectory=/tmp/artifacts
49+
- run: mvn clean install -DoutputDirectory=/tmp/artifacts && cp cassandra-2.2/target/cassandra-kerberos-*.jar /tmp/artifacts
5050

5151
- save_cache:
5252
paths:
@@ -79,7 +79,7 @@ jobs:
7979
- m2-{{ checksum "pom.xml" }}
8080
- m2-
8181

82-
- run: mvn clean install -DoutputDirectory=/tmp/artifacts
82+
- run: mvn clean install -DoutputDirectory=/tmp/artifacts && cp cassandra-3.0/target/cassandra-kerberos-*.jar /tmp/artifacts
8383

8484
- save_cache:
8585
paths:
@@ -112,7 +112,7 @@ jobs:
112112
- m2-{{ checksum "pom.xml" }}
113113
- m2-
114114

115-
- run: mvn clean install -DoutputDirectory=/tmp/artifacts
115+
- run: mvn clean install -DoutputDirectory=/tmp/artifacts && cp cassandra-3.1/target/cassandra-kerberos-*.jar /tmp/artifacts
116116

117117
- save_cache:
118118
paths:
@@ -145,7 +145,7 @@ jobs:
145145
- m2-{{ checksum "pom.xml" }}
146146
- m2-
147147

148-
- run: mvn clean install -DoutputDirectory=/tmp/artifacts
148+
- run: mvn clean install -DoutputDirectory=/tmp/artifacts && cp cassandra-4.0/target/cassandra-kerberos-*.jar /tmp/artifacts
149149

150150
- save_cache:
151151
paths:
@@ -155,9 +155,42 @@ jobs:
155155
- persist_to_workspace:
156156
root: /tmp/artifacts
157157
paths:
158-
- "cassandra-kerberos-4*.jar"
159-
- "cassandra-kerberos-4*.deb"
160-
- "cassandra-kerberos-4*.rpm"
158+
- "cassandra-kerberos-4.0*.jar"
159+
- "cassandra-kerberos-4.0*.deb"
160+
- "cassandra-kerberos-4.0*.rpm"
161+
162+
build-4-1:
163+
164+
docker:
165+
- image: cimg/openjdk:8.0
166+
167+
working_directory: ~/cassandra-kerberos
168+
169+
environment:
170+
MAVEN_OPTS: -Xmx3200m
171+
172+
steps:
173+
174+
- checkout
175+
176+
- restore_cache:
177+
keys:
178+
- m2-{{ checksum "pom.xml" }}
179+
- m2-
180+
181+
- run: mvn clean install -DoutputDirectory=/tmp/artifacts && cp cassandra-4.1/target/cassandra-kerberos-*.jar /tmp/artifacts
182+
183+
- save_cache:
184+
paths:
185+
- ~/.m2
186+
key: m2-{{ checksum "pom.xml" }}
187+
188+
- persist_to_workspace:
189+
root: /tmp/artifacts
190+
paths:
191+
- "cassandra-kerberos-4.1*.jar"
192+
- "cassandra-kerberos-4.1*.deb"
193+
- "cassandra-kerberos-4.1*.rpm"
161194

162195
publish-github-release-2-2:
163196
docker:
@@ -212,6 +245,19 @@ jobs:
212245
go get github.com/tcnksm/ghr
213246
ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} ./artifacts/
214247
248+
publish-github-release-4-1:
249+
docker:
250+
- image: circleci/golang
251+
steps:
252+
- attach_workspace:
253+
at: ./artifacts
254+
- run:
255+
name: "Publish 4.1 Release on GitHub"
256+
command: |
257+
set -xue
258+
go get github.com/tcnksm/ghr
259+
ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} ./artifacts/
260+
215261
workflows:
216262
version: 2
217263
main:
@@ -243,7 +289,13 @@ workflows:
243289
branches:
244290
ignore: /.*/
245291
tags:
246-
only: /^v4.0-beta3-\d+\.\d+\.\d+$/
292+
only: /^v4.0.\d+\-\d+\.\d+\.\d+$/
293+
- build-4-1:
294+
filters:
295+
branches:
296+
ignore: /.*/
297+
tags:
298+
only: /^v4.1.\d+\-\d+\.\d+\.\d+$/
247299
- publish-github-release-2-2:
248300
requires:
249301
- build-2-2
@@ -275,4 +327,12 @@ workflows:
275327
branches:
276328
ignore: /.*/
277329
tags:
278-
only: /^v4.0-beta3-\d+\.\d+\.\d+$/
330+
only: /^v4.0.\d+\-\d+\.\d+\.\d+$/
331+
- publish-github-release-4-1:
332+
requires:
333+
- build-4-1
334+
filters:
335+
branches:
336+
ignore: /.*/
337+
tags:
338+
only: /^v4.1.\d+\-\d+\.\d+\.\d+$/

cassandra-4.1/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<requires>
6262
<require>
6363
<name>cassandra</name>
64-
<version>4.0</version>
64+
<version>4.1</version>
6565
<greaterOrEqual/>
6666
</require>
6767
</requires>

cassandra-4/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

12-
<artifactId>cassandra-kerberos-4</artifactId>
12+
<artifactId>cassandra-kerberos-4.0</artifactId>
1313
<version>1.0.0</version>
1414

1515
<name>Cassandra Kerberos Authenticator for Cassandra 4</name>

0 commit comments

Comments
 (0)