Merge pull request #121 from FundingCircle/AF-1144-migrate-pipeline

[AF-1144] Migrate pipeline
FundingCircle · Feb 13, 2024 · a7e1edd · a7e1edd
2 parents 3febc76 + 1634e57
commit a7e1edd
Show file tree

Hide file tree

Showing 8 changed files with 107 additions and 49 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.drone.yml b/.drone.yml
@@ -0,0 +1,83 @@
+---
+kind: pipeline
+type: docker
+name: build
+
+# Platform for job, always Linux amd64
+platform:
+  os: linux
+  arch: amd64
+
+# Do not allow concurrent builds / deployments
+concurrency:
+  limit: 1
+
+anchors:
+  bundle_fundingcircle__jfrog__io: &bundle_fundingcircle__jfrog__io
+    environment:
+      BUNDLE_FUNDINGCIRCLE__JFROG__IO:
+        from_secret: bundle_fundingcircle__jfrog__io
+
+  # Settings to build container image
+  docker_settings: &docker_settings
+    pull_image: true
+    custom_labels:
+      - 'org.fundingcircle.image.manager=afep@fundingcircle.com'
+    registry: https://quay.io
+    repo: quay.io/fundingcircle/radius
+    dockerfile: Dockerfile
+
+  # Container registry credentials for Quay.io
+  docker_credentials: &docker_credentials
+    DOCKER_PASSWORD:
+      from_secret: docker_password
+    DOCKER_USERNAME:
+      from_secret: docker_username
+
+steps:
+  ############################################################################
+  # Push
+  #
+  # Run steps on each push to all branches
+
+  # Install dependencies
+  - name: install_node
+    image: node:18.17.1
+    commands:
+      - npm config set registry https://fundingcircle.jfrog.io/fundingcircle/api/npm/npm/
+      - curl https://$BUNDLE_FUNDINGCIRCLE__JFROG__IO@fundingcircle.jfrog.io/fundingcircle/api/npm/auth >> .npmrc
+      - npm config fix
+      - npm ci
+    <<: *bundle_fundingcircle__jfrog__io
+    depends_on:
+      - clone
+
+  - name: install_ruby
+    image: ruby:3.3.0
+    volumes:
+      - name: bundle
+        path: /usr/local/bundle
+    commands:
+      - bundle install
+    depends_on:
+      - clone
+
+  - name: run_lint_tests
+    image: ruby:3.3.0
+    volumes:
+      - name: bundle
+        path: /usr/local/bundle
+    commands:
+      - bundle exec rake --trace
+    depends_on:
+      - install_ruby
+
+volumes:
+  - name: bundle
+    temp: {}
+
+trigger:
+  event:
+    - push
+  # End of push to all branches
+  ############################################################################
diff --git a/dist/fonts/fc-icons.eot b/dist/fonts/fc-icons.eot
diff --git a/dist/fonts/fc-icons.ttf b/dist/fonts/fc-icons.ttf
diff --git a/dist/fonts/fc-icons.woff b/dist/fonts/fc-icons.woff
diff --git a/dist/sass/general/forms-v2.scss b/dist/sass/general/forms-v2.scss
@@ -322,12 +322,14 @@
       }
     }
 
-    %select-error, .select.error {
+    %select-error,
+    .select.error {
       @extend %select;
       @extend .error;
     }
 
-    %select-valid, .select.valid {
+    %select-valid,
+    .select.valid {
       @extend %select;
       @extend .valid;
     }

diff --git a/dist/style.css b/dist/style.css
@@ -1829,10 +1829,12 @@ form h3 {
     .form-default input:focus[type="text"], .form-default input:focus[type="password"], .form-default input:focus[type="search"], .form-default input:focus[type="email"], .form-default input:focus[type="url"], .form-default input:focus[type="tel"], .form-default input:focus[type="number"], .form-default input:focus[type="range"], .form-default input:focus[type="date"], .form-default input:focus[type="month"], .form-default input:focus[type="week"], .form-default input:focus[type="time"], .form-default .select:focus,
     .form-default textarea:focus {
       outline-color: #37b0c9; }
-    .form-default input.valid[type="text"], .form-default input.valid[type="password"], .form-default input.valid[type="search"], .form-default input.valid[type="email"], .form-default input.valid[type="url"], .form-default input.valid[type="tel"], .form-default input.valid[type="number"], .form-default input.valid[type="range"], .form-default input.valid[type="date"], .form-default input.valid[type="month"], .form-default input.valid[type="week"], .form-default input.valid[type="time"], .form-default .valid.select, .form-default .select .select.valid,
+    .form-default input.valid[type="text"], .form-default input.valid[type="password"], .form-default input.valid[type="search"], .form-default input.valid[type="email"], .form-default input.valid[type="url"], .form-default input.valid[type="tel"], .form-default input.valid[type="number"], .form-default input.valid[type="range"], .form-default input.valid[type="date"], .form-default input.valid[type="month"], .form-default input.valid[type="week"], .form-default input.valid[type="time"], .form-default .valid.select,
+    .form-default .select .select.valid,
     .form-default textarea.valid {
       border-right: 4px solid #009c50; }
-    .form-default input.error[type="text"], .form-default input.error[type="password"], .form-default input.error[type="search"], .form-default input.error[type="email"], .form-default input.error[type="url"], .form-default input.error[type="tel"], .form-default input.error[type="number"], .form-default input.error[type="range"], .form-default input.error[type="date"], .form-default input.error[type="month"], .form-default input.error[type="week"], .form-default input.error[type="time"], .form-default .error.select, .form-default .select .select.error,
+    .form-default input.error[type="text"], .form-default input.error[type="password"], .form-default input.error[type="search"], .form-default input.error[type="email"], .form-default input.error[type="url"], .form-default input.error[type="tel"], .form-default input.error[type="number"], .form-default input.error[type="range"], .form-default input.error[type="date"], .form-default input.error[type="month"], .form-default input.error[type="week"], .form-default input.error[type="time"], .form-default .error.select,
+    .form-default .select .select.error,
     .form-default textarea.error {
       outline-color: #d60036;
       color: #d60036; }
@@ -1843,15 +1845,23 @@ form h3 {
   .form-default textarea {
     padding: 16px 16px;
     line-height: normal; }
-  .form-default .select, .form-default .select select.error, .form-default .select .select.error, .form-default .select select.valid, .form-default .select .select.valid, .form-default .select--inline {
+  .form-default .select, .form-default .select select.error,
+  .form-default .select .select.error, .form-default .select select.valid,
+  .form-default .select .select.valid, .form-default .select--inline {
     position: relative;
     height: 40px; }
-    .form-default .select:before, .form-default .select select.error:before, .form-default .select .select.error:before, .form-default .select select.valid:before, .form-default .select .select.valid:before, .form-default .select--inline:before, .form-default .select:after, .form-default .select select.error:after, .form-default .select .select.error:after, .form-default .select select.valid:after, .form-default .select .select.valid:after, .form-default .select--inline:after {
+    .form-default .select:before, .form-default .select select.error:before,
+    .form-default .select .select.error:before, .form-default .select select.valid:before,
+    .form-default .select .select.valid:before, .form-default .select--inline:before, .form-default .select:after, .form-default .select select.error:after,
+    .form-default .select .select.error:after, .form-default .select select.valid:after,
+    .form-default .select .select.valid:after, .form-default .select--inline:after {
       content: '';
       display: block;
       position: absolute;
       z-index: 1; }
-    html:not(.ie) .form-default .select:after, html:not(.ie) .form-default .select select.error:after, html:not(.ie) .form-default .select .select.error:after, html:not(.ie) .form-default .select select.valid:after, html:not(.ie) .form-default .select .select.valid:after, html:not(.ie) .form-default .select--inline:after {
+    html:not(.ie) .form-default .select:after, html:not(.ie) .form-default .select select.error:after,
+    html:not(.ie) .form-default .select .select.error:after, html:not(.ie) .form-default .select select.valid:after,
+    html:not(.ie) .form-default .select .select.valid:after, html:not(.ie) .form-default .select--inline:after {
       display: block;
       width: 0;
       height: 0;
@@ -1966,9 +1976,11 @@ form h3 {
       padding-right: 24px;
       padding-left: 8px;
       width: 128px; }
-      .form-default .input--inline input.error, .form-default .input--inline .select input.select.error, .form-default .select .input--inline input.select.error {
+      .form-default .input--inline input.error,
+      .form-default .input--inline .select input.select.error, .form-default .select .input--inline input.select.error {
         border-bottom-color: #d60036; }
-      .form-default .input--inline input.valid, .form-default .input--inline .select input.select.valid, .form-default .select .input--inline input.select.valid {
+      .form-default .input--inline input.valid,
+      .form-default .input--inline .select input.select.valid, .form-default .select .input--inline input.select.valid {
         border-right: 0;
         border-bottom-color: #009c50; }
       .form-default .input--inline input:focus {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sass-common",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "description": "Collection of the SASS mixins used to style the Funding Circle pages.",
   "repository": {
     "type": "git",