fix config.yaml

instaclustr · Jun 28, 2022 · b0031ad · b0031ad
1 parent bf3faed
commit b0031ad
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -22,7 +22,7 @@ jobs:
             - ~/.m2
           key: m2-{{ checksum "pom.xml" }}
 
-      - run: mvn clean install -DoutputDirectory=/tmp/artifacts
+      - run: mvn clean install -DoutputDirectory=/tmp/artifacts && cp cassandra-{2.2,3.0,3.11,4,4.1}/target/cassandra-kerberos-*.jar /tmp/artifacts
 
       - store_artifacts:
           path: /tmp/artifacts
@@ -46,7 +46,7 @@ jobs:
             - m2-{{ checksum "pom.xml" }}
             - m2-
 
-      - run: mvn clean install -DoutputDirectory=/tmp/artifacts
+      - run: mvn clean install -DoutputDirectory=/tmp/artifacts && cp cassandra-2.2/target/cassandra-kerberos-*.jar /tmp/artifacts
 
       - save_cache:
           paths:
@@ -79,7 +79,7 @@ jobs:
             - m2-{{ checksum "pom.xml" }}
             - m2-
 
-      - run: mvn clean install -DoutputDirectory=/tmp/artifacts
+      - run: mvn clean install -DoutputDirectory=/tmp/artifacts && cp cassandra-3.0/target/cassandra-kerberos-*.jar /tmp/artifacts
 
       - save_cache:
           paths:
@@ -112,7 +112,7 @@ jobs:
             - m2-{{ checksum "pom.xml" }}
             - m2-
 
-      - run: mvn clean install -DoutputDirectory=/tmp/artifacts
+      - run: mvn clean install -DoutputDirectory=/tmp/artifacts && cp cassandra-3.1/target/cassandra-kerberos-*.jar /tmp/artifacts
 
       - save_cache:
           paths:
@@ -145,7 +145,7 @@ jobs:
             - m2-{{ checksum "pom.xml" }}
             - m2-
 
-      - run: mvn clean install -DoutputDirectory=/tmp/artifacts
+      - run: mvn clean install -DoutputDirectory=/tmp/artifacts && cp cassandra-4.0/target/cassandra-kerberos-*.jar /tmp/artifacts
 
       - save_cache:
           paths:
@@ -155,9 +155,42 @@ jobs:
       - persist_to_workspace:
           root: /tmp/artifacts
           paths:
-            - "cassandra-kerberos-4*.jar"
-            - "cassandra-kerberos-4*.deb"
-            - "cassandra-kerberos-4*.rpm"
+            - "cassandra-kerberos-4.0*.jar"
+            - "cassandra-kerberos-4.0*.deb"
+            - "cassandra-kerberos-4.0*.rpm"
+
+  build-4-1:
+
+    docker:
+      - image: cimg/openjdk:8.0
+
+    working_directory: ~/cassandra-kerberos
+
+    environment:
+      MAVEN_OPTS: -Xmx3200m
+
+    steps:
+
+      - checkout
+
+      - restore_cache:
+          keys:
+            - m2-{{ checksum "pom.xml" }}
+            - m2-
+
+      - run: mvn clean install -DoutputDirectory=/tmp/artifacts && cp cassandra-4.1/target/cassandra-kerberos-*.jar /tmp/artifacts
+
+      - save_cache:
+          paths:
+            - ~/.m2
+          key: m2-{{ checksum "pom.xml" }}
+
+      - persist_to_workspace:
+          root: /tmp/artifacts
+          paths:
+            - "cassandra-kerberos-4.1*.jar"
+            - "cassandra-kerberos-4.1*.deb"
+            - "cassandra-kerberos-4.1*.rpm"
 
   publish-github-release-2-2:
     docker:
@@ -212,6 +245,19 @@ jobs:
             go get github.com/tcnksm/ghr
             ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} ./artifacts/
 
+  publish-github-release-4-1:
+    docker:
+      - image: circleci/golang
+    steps:
+      - attach_workspace:
+          at: ./artifacts
+      - run:
+          name: "Publish 4.1 Release on GitHub"
+          command: |
+            set -xue
+            go get github.com/tcnksm/ghr
+            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} ./artifacts/
+
 workflows:
   version: 2
   main:
@@ -243,7 +289,13 @@ workflows:
             branches:
               ignore: /.*/
             tags:
-              only: /^v4.0-beta3-\d+\.\d+\.\d+$/
+              only: /^v4.0.\d+\-\d+\.\d+\.\d+$/
+      - build-4-1:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^v4.1.\d+\-\d+\.\d+\.\d+$/
       - publish-github-release-2-2:
           requires:
             - build-2-2
@@ -275,4 +327,12 @@ workflows:
             branches:
               ignore: /.*/
             tags:
-              only: /^v4.0-beta3-\d+\.\d+\.\d+$/
+              only: /^v4.0.\d+\-\d+\.\d+\.\d+$/
+      - publish-github-release-4-1:
+          requires:
+            - build-4-1
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^v4.1.\d+\-\d+\.\d+\.\d+$/
diff --git a/cassandra-4.1/pom.xml b/cassandra-4.1/pom.xml
@@ -61,7 +61,7 @@
                             <requires>
                                 <require>
                                     <name>cassandra</name>
-                                    <version>4.0</version>
+                                    <version>4.1</version>
                                     <greaterOrEqual/>
                                 </require>
                             </requires>

diff --git a/cassandra-4/pom.xml b/cassandra-4/pom.xml
@@ -9,7 +9,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>cassandra-kerberos-4</artifactId>
+    <artifactId>cassandra-kerberos-4.0</artifactId>
     <version>1.0.0</version>
 
     <name>Cassandra Kerberos Authenticator for Cassandra 4</name>