Add cache (#433)

* Updated base image to the latest one * Add cache * cleanup resolvers * remove jfrog * remove snapshots repository Co-authored-by: Ty <[email protected]> Co-authored-by: Marios Tsekis <[email protected]>
dataswift · Apr 20, 2021 · e6a26ea · e6a26ea
1 parent d1058d6
commit e6a26ea
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 37 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,6 +1,5 @@
 version: 2
 updates:
-
   - package-ecosystem: "github-actions"
     directory: "/"
     target-branch: "main"

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -1,32 +1,32 @@
-name-template: 'v$RESOLVED_VERSION'
-tag-template: 'v$RESOLVED_VERSION'
+name-template: "v$RESOLVED_VERSION"
+tag-template: "v$RESOLVED_VERSION"
 
 categories:
-  - title: 'Features'
+  - title: "Features"
     labels:
-      - 'feature'
-  - title: 'Bugs'
+      - "feature"
+  - title: "Bugs"
     labels:
-      - 'bug'
-      - 'fix'
-  - title: 'Maintenance'
-    labels: 
-      - 'chore'
+      - "bug"
+      - "fix"
+  - title: "Maintenance"
+    labels:
+      - "chore"
 
-change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+change-template: "- $TITLE @$AUTHOR (#$NUMBER)"
 change-title-escapes: '\<*_&'
 
 version-resolver:
   default: patch
   major:
     labels:
-      - 'major'
+      - "major"
   minor:
     labels:
-      - 'minor'
+      - "minor"
   patch:
     labels:
-      - 'patch'
+      - "patch"
 
 template: |
   ## Changes

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
         with:
-          fetch-depth: 0
+          submodules: recursive
+
+      - name: Cache - GHA
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/coursier/v1/https
+          key: ${{ runner.OS }}-coursier-cache
+
+      - name: Add extra resolvers
+        run: curl https://${{ secrets.ARTIFACTS_CACHE_BUCKET }}/resolvers.sbt --create-dirs -o ~/.sbt/resolvers.sbt
 
       - name: Setup
         uses: actions/setup-java@v1
@@ -45,4 +54,13 @@ jobs:
 
       - name: Build
         run: sbt docker:stage && docker build hat/target/docker/stage
-
+
+      - name: AWS - Configure
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.DEPLOYER_SHARED_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.DEPLOYER_SHARED_SECRET_ACCESS_KEY }}
+          aws-region: eu-west-1
+
+      - name: Cache - Upload
+        run: aws s3 sync ~/.cache/coursier/v1/https/ s3://${{ secrets.ARTIFACTS_CACHE_BUCKET }} --sse AES256 --follow-symlinks --no-progress
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -23,9 +23,19 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Setup 
-        uses: actions/setup-java@v1
+      - name: Cache - GHA
+        uses: actions/cache@v1
         with:
+          path: ~/.cache/coursier/v1/https
+          key: ${{ runner.OS }}-coursier-cache
+
+      - name: Add extra resolvers
+        run: curl https://${{ secrets.ARTIFACTS_CACHE_BUCKET }}/resolvers.sbt --create-dirs -o ~/.sbt/resolvers.sbt
+
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: adopt
           java-version: 11
           java-package: jdk
           architecture: x64
@@ -57,7 +67,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_DATASWIFT_USER }}
           password: ${{ secrets.DOCKERHUB_DATASWIFT_PASS }}
-        
+
       - name: Container Registry - Push
         run: docker push ${{ env.REPOSITORY }}:${{ github.sha }}
 

diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml
@@ -22,9 +22,19 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Setup
-        uses: actions/setup-java@v1
+      - name: Cache - GHA
+        uses: actions/cache@v1
         with:
+          path: ~/.cache/coursier/v1/https
+          key: ${{ runner.OS }}-coursier-cache
+
+      - name: Add extra resolvers
+        run: curl https://${{ secrets.ARTIFACTS_CACHE_BUCKET }}/resolvers.sbt --create-dirs -o ~/.sbt/resolvers.sbt
+
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: adopt
           java-version: 11
           java-package: jdk
           architecture: x64

diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
@@ -22,9 +22,19 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Setup
-        uses: actions/setup-java@v1
+      - name: Cache - GHA
+        uses: actions/cache@v1
         with:
+          path: ~/.cache/coursier/v1/https
+          key: ${{ runner.OS }}-coursier-cache
+
+      - name: Add extra resolvers
+        run: curl https://${{ secrets.ARTIFACTS_CACHE_BUCKET }}/resolvers.sbt --create-dirs -o ~/.sbt/resolvers.sbt
+
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: adopt
           java-version: 11
           java-package: jdk
           architecture: x64

diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -1,11 +1,9 @@
-# Run trivy creating a github issue for any issues
-# For each github issue create a Jira Ticket linking to the issue
-name: Trivy Jira
+name: Trivy
 
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 4 * * MON'
+    - cron: "0 4 * * MON"
 
 env:
   REGISTRY: dataswift/hat
@@ -31,9 +29,9 @@ env:
           with:
             token: ${{ secrets.GITHUB_TOKEN }}
             image: ${{ env.REGISTRY }}:${{ github.sha }}
-            issue: 'true'
+            issue: "true"
             issue_label: trivy, vulnerability, security
-            issue_title: Trivy generated Security Alert
+            issue_title: Trivy Security Alert
 
         - name: Jira Login
           if: steps.trivy.outputs.issue_number != ''
@@ -50,7 +48,7 @@ env:
           with:
             project: ${{ secrets.JIRA_TRIVY_PROJECT }}
             issuetype: ${{ secrets.JIRA_TRIVY_ISSUE_TYPE }}
-            summary: Trivy has detected a vulnerability with a Docker container
+            summary: Trivy Security Alert - ${{ github.repository }}
             description: ${{steps.trivy.outputs.html_url}}
 
         - name: Container - Scan - Save Result
@@ -68,4 +66,3 @@ env:
           uses: github/codeql-action/upload-sarif@v1
           with:
             sarif_file: "trivy-results.sarif"
-
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -48,11 +48,9 @@ object Dependencies {
   }
 
   val resolvers = Seq(
-    Resolver.jcenterRepo,
-    "Atlassian Releases" at "https://maven.atlassian.com/public/",
-    Resolver.bintrayRepo("scalaz", "releases"),
-    "HAT Library Artifacts Snapshots" at "https://s3-eu-west-1.amazonaws.com/library-artifacts-snapshots.hubofallthings.com",
-    "HAT Library Artifacts Releases" at "https://s3-eu-west-1.amazonaws.com/library-artifacts-releases.hubofallthings.com"
+    "Atlassian" at "https://maven.atlassian.com/public/",
+    "HAT Library Artifacts Releases" at "https://s3-eu-west-1.amazonaws.com/library-artifacts-releases.hubofallthings.com",
+    "HAT Library Artifacts Snapshots" at "https://s3-eu-west-1.amazonaws.com/library-artifacts-snapshots.hubofallthings.com"
   )
 
   object Library {