Workflow updates and version update

- Cleaned up the ci workflow task - Switched from the non-managed SonarCloud task to the team instance - Implemented correct caching steps for packages - Updated project version back to 2.1.0-SNAPSHOT
aem-design · Nov 12, 2020 · 0f935a7 · 0f935a7
1 parent 3dac536
commit 0f935a7
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 44 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,30 +1,27 @@
 name: ci
 
-on: [ push ]
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+    types: [ opened, synchronize, reopened ]
 
 jobs:
   build:
     if: "!contains(github.event.head_commit.message, 'skip ci')"
     runs-on: ubuntu-latest
+
     strategy:
       max-parallel: 4
       matrix:
         python-version: [ 3.6 ]
 
     env:
       DOCKER_IMAGE: "aemdesign/centos-java-buildpack"
-      SONAR_ORGANISATION: "aemdesign-github"
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      SONAR_URL: "https://sonarcloud.io"
-      SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-      SONATYPE_USERNAME: "aemdesign"
-      GITHUB_USER: aemdesign
-      TRAVIS_TOKEN: ${{ secrets.TRAVIS_TOKEN }}
       GITHUB_EMAIL: ${{ secrets.GITHUB_EMAIL }}
       GITHUB_USERNAME: ${{ secrets.GITHUB_USERNAME }}
-      GITHUB_TOKEN_ADMIN: ${{ secrets.GITHUB_TOKEN_ADMIN }}
-      AEM_NAME: ${{ secrets.AEM_NAME }}
-      AEM_KEY: ${{ secrets.AEM_KEY }}
       GPG_SECRET_KEYS: ${{ secrets.GPG_SECRET_KEYS }}
       GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}
       GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
@@ -39,14 +36,6 @@ jobs:
           submodules: true
           lfs: true
 
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '10.x'
-          registry-url: https://npm.pkg.github.com/
-          scope: "@aem-design"
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN_ADMIN }}
-
       - name: set up python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:
@@ -72,26 +61,28 @@ jobs:
         run: |
           source <(curl -sL https://github.com/aem-design/aemdesign-docker/releases/latest/download/setup-gpg.sh)
 
-      - name: cache local maven repository
-        uses: actions/cache@v2
+      - name: cache sonarcloud packages
+        uses: actions/cache@v1
         with:
-          path: ${{ github.workspace }}/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
 
-      - name: docker - mvn package
-        run: $DOCKER_COMMAND mvn package -B -Dmaven.repo.local=./build/.m2/repository
+      - name: cache maven packages
+        uses: actions/cache@v1
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
 
-      # SonarQube for master
-      - name: docker - sonar qube on master
-        if: github.ref == 'refs/heads/master'
-        run: mvn sonar:sonar -q "-Dsonar.branch.name=${GITHUB_REF}" "-Dsonar.host.url=${SONAR_URL}" "-Dsonar.login=${SONAR_TOKEN}" "-Dsonar.organization=${SONAR_ORGANISATION}"
+      - name: mvn package
+        run: $DOCKER_COMMAND mvn package -B -Dmaven.repo.local=./build/.m2/repository
 
-      # SonarQube for branches
-      - name: docker - sonar qube on branches
-        if: github.ref != 'refs/heads/master'
-        run: mvn sonar:sonar -q "-Dsonar.branch.name=${GITHUB_REF}" "-Dsonar.branch.target=master" "-Dsonar.host.url=${SONAR_URL}" "-Dsonar.login=${SONAR_TOKEN}" "-Dsonar.organization=${SONAR_ORGANISATION}"
+      - name: sonarcloud analysis
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_GLOBAL }}
+        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
 
       - name: run unit tests with coverage reports
         run: mvn test -q && bash <(curl -s https://codecov.io/bash)

diff --git a/aemdesign-aem-author/pom.xml b/aemdesign-aem-author/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-author</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Author UI Updates</name>
     <description>AEM.Design extensions and libraries that enhance the default authoring UI</description>

diff --git a/aemdesign-aem-common/pom.xml b/aemdesign-aem-common/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-common</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Common</name>
     <description>AEM.Design components and base templates</description>

diff --git a/aemdesign-aem-core-deploy/pom.xml b/aemdesign-aem-core-deploy/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
     <packaging>content-package</packaging>
     <name>AEM Design - Core - Deployment Package</name>
     <description>AEM.Design deployment package for all packages</description>
-    <version>2.1.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <url>https://aem.design</url>
 
     <developers>

diff --git a/aemdesign-aem-services/pom.xml b/aemdesign-aem-services/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-services</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>AEM Design - Core - AEM Services</name>
     <description>Project for all AEM and OSGI Services</description>

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 
     <groupId>design.aem</groupId>
     <artifactId>aemdesign-aem-core</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>AEM Design - Core Project</name>
@@ -66,6 +66,9 @@
         <bundleName>design.aem.aemdesign-aem-services</bundleName>
         <adobe.acs.version>4.4.0</adobe.acs.version>
         <core.wcm.components.version>2.8.0</core.wcm.components.version>
+        <sonar.projectKey>aem-design_aemdesign-aem-core</sonar.projectKey>
+        <sonar.organization>aem-design</sonar.organization>
+        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     </properties>
 
     <developers>
@@ -117,6 +120,12 @@
     <!-- ====================================================================== -->
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.sonarsource.scanner.maven</groupId>
+                <artifactId>sonar-maven-plugin</artifactId>
+                <version>3.7.0.1746</version>
+            </dependency>
+
             <!-- OSGi annotations for DS and metatype -->
             <dependency>
                 <groupId>org.osgi</groupId>