From 612a64ac1d108fe508e42a1cb8e694f241407b6a Mon Sep 17 00:00:00 2001 From: emmajphillips Date: Mon, 12 Feb 2024 14:47:23 +0000 Subject: [PATCH 1/3] Add drone pipeline file --- .drone.yml | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..de79bfa --- /dev/null +++ b/.drone.yml @@ -0,0 +1,86 @@ +--- +kind: pipeline +type: docker +name: branch + +# 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: + ############################################################################ + # Feature branch push + # + # Run steps on each push to a feature branch + + # 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 + branch: + exclude: + - master + # End of push to feature branch + ############################################################################ From b99b1b222cdc3e64d5bee998d8cc20a190f5ac98 Mon Sep 17 00:00:00 2001 From: emmajphillips Date: Tue, 13 Feb 2024 10:43:23 +0000 Subject: [PATCH 2/3] Create pre-release --- dist/fonts/fc-icons.eot | Bin 4596 -> 4596 bytes dist/fonts/fc-icons.ttf | Bin 4428 -> 4428 bytes dist/fonts/fc-icons.woff | Bin 2844 -> 2844 bytes dist/sass/general/forms-v2.scss | 6 ++++-- dist/style.css | 26 +++++++++++++++++++------- package.json | 2 +- 6 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dist/fonts/fc-icons.eot b/dist/fonts/fc-icons.eot index f2cf54d030f7c97f098da57d14086ccaaaa22e52..7cab272bcce599a4eff6e44770b14b20d01ada05 100644 GIT binary patch delta 56 zcmeyO{6%?!4a@qNnv{tSJ6P22naWQ5Gest)CT4v+zs*+$ZswN^K=AOx4@DTgc@3k7 F0058x78d{j delta 56 zcmeyO{6%?!4a@Hbc?A<4cCaWs`Sg9_pD8j0c@KWa^V@u7;AVcw00j5Gg!94Z&1)Dv F1OWYW7vul{ diff --git a/dist/fonts/fc-icons.ttf b/dist/fonts/fc-icons.ttf index d360df3bdfe5f7ce37b1826c135445ad2b487d23..8a5902ed9ae0cc69c84ddb2a975195df1bda697f 100644 GIT binary patch delta 48 wcmX@3bVg}H0E^l^Q`w0jQ)E(VV%Ep=+k9ooDW8CW?}RY008+C5)c3Y diff --git a/dist/fonts/fc-icons.woff b/dist/fonts/fc-icons.woff index ffc69aee808f1f8af25b60a66e7ba4ad66ef182b..ea07bd8cc7e51c7617643b8e6ce87282add0a89f 100644 GIT binary patch delta 63 zcmV-F0Kos87MvE4j07g$H65{#;Rh;|8rA%Gew(ih+{`b5A`A~d{7{6^|3Cl#&-{w{ V8<5MvzyuNn0F3qz!LyqPfdaA?9yI^} delta 63 zcmV-F0Kos87MvE4j07O$^7pZj;Rh;$yp_A-`E9;3a5KLIiZI;!63z#s|9}4fpZOK@ VHz1dTfe9oE0FJH?DYKghfdUnk9-aUI diff --git a/dist/sass/general/forms-v2.scss b/dist/sass/general/forms-v2.scss index fd8d3e4..a3b1c2b 100644 --- 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 index 7186ed2..42ec648 100644 --- 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 index 79972eb..95ff98f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sass-common", - "version": "2.10.0", + "version": "2.10.1-prerelease", "description": "Collection of the SASS mixins used to style the Funding Circle pages.", "repository": { "type": "git", From 1634e57dcabdc89bebc42df73090d17ba473f7b2 Mon Sep 17 00:00:00 2001 From: emmajphillips Date: Tue, 13 Feb 2024 11:25:41 +0000 Subject: [PATCH 3/3] Bump version and remove CircleCI config --- .circleci/config.yml | 39 --------------------------------------- .drone.yml | 11 ++++------- dist/fonts/fc-icons.eot | Bin 4596 -> 4596 bytes dist/fonts/fc-icons.ttf | Bin 4428 -> 4428 bytes dist/fonts/fc-icons.woff | Bin 2844 -> 2844 bytes package.json | 2 +- 6 files changed, 5 insertions(+), 47 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 905c41c..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,39 +0,0 @@ -version: 2.1 - -commands: - install_node_dependencies: - description: "Install Node.js dependencies" - steps: - - checkout - - run: npm config set registry https://fundingcircle.jfrog.io/fundingcircle/api/npm/npm/ - - run: curl https://$BUNDLE_FUNDINGCIRCLE__JFROG__IO@fundingcircle.jfrog.io/fundingcircle/api/npm/auth >> .npmrc - - run: npm config fix - - run: npm ci - parameters: - node_env: - type: string - default: '18' - install_ruby_dependencies: - description: "Install Ruby dependencies" - steps: - - run: bundle check --path=vendor/bundle || bundle install --path=vendor/bundle - run_tests: - description: "Run tests" - steps: - - run: bundle exec rake --trace - -jobs: - build: - docker: - - image: cimg/ruby:3.3.0-node - steps: - - install_node_dependencies - - install_ruby_dependencies - - run_tests - -workflows: - version: 2.1 - ci: - jobs: - - build: - context: org-global diff --git a/.drone.yml b/.drone.yml index de79bfa..3ae0533 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,7 +1,7 @@ --- kind: pipeline type: docker -name: branch +name: build # Platform for job, always Linux amd64 platform: @@ -36,9 +36,9 @@ anchors: steps: ############################################################################ - # Feature branch push + # Push # - # Run steps on each push to a feature branch + # Run steps on each push to all branches # Install dependencies - name: install_node @@ -79,8 +79,5 @@ volumes: trigger: event: - push - branch: - exclude: - - master - # End of push to feature branch + # End of push to all branches ############################################################################ diff --git a/dist/fonts/fc-icons.eot b/dist/fonts/fc-icons.eot index 7cab272bcce599a4eff6e44770b14b20d01ada05..989336a8d8a8ec05309a49f6c80e0dd8e401b08d 100644 GIT binary patch delta 50 zcmeyO{6%?!4U@L+M7upqKKCd7nI@&H9nWv`m4Tc2B?AyV{K&!tqc^W%^bi05(rXZ) delta 50 zcmeyO{6%?!4b%FViFSLKOl2qjnI;vpKAzv^D+4$4O9mi#_~C~ljNZJ4(L(?L{wEVr diff --git a/dist/fonts/fc-icons.ttf b/dist/fonts/fc-icons.ttf index 8a5902ed9ae0cc69c84ddb2a975195df1bda697f..a6b398451f678fca5893d1a02d967ee2a5135ae0 100644 GIT binary patch delta 44 scmX@3bVg}H5R=dSi6PUZbhYF8ZN4&aGrwd2f`=bjm|*l~7Df*N08p`ZN4&aGrwd2f`=b|D8lH?EQ}rk0A7g?EdT%j diff --git a/dist/fonts/fc-icons.woff b/dist/fonts/fc-icons.woff index ea07bd8cc7e51c7617643b8e6ce87282add0a89f..c51df5b5aa3969e47406c53929ca8c05f024522f 100644 GIT binary patch delta 67 zcmV-J0KEU47MvE4hY2zO001^7-b~-Ikm3g^>aVZk`E9;3a5KLIiZDF<$if7p|9}4f ZpZOK@Hz1dT0W1mtl06RS0JED2fdctQ9ohf@ delta 67 zcmV-J0KEU47MvE4hY2$P001^7-ZdSukm3g^8rA%Gew(ih+{`b5A`A~d{7{6^|3Cl# Z&-{w{8<5MvzyuNn0F3qz!LyqPfdaJ_9tr>e diff --git a/package.json b/package.json index 95ff98f..40de34a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sass-common", - "version": "2.10.1-prerelease", + "version": "2.10.1", "description": "Collection of the SASS mixins used to style the Funding Circle pages.", "repository": { "type": "git",