Skip to content

Commit

Permalink
Merge pull request #118 from FundingCircle/AF-999-updates
Browse files Browse the repository at this point in the history
AF-999 Update Ruby version and CODEOWNERS file
  • Loading branch information
tayyabataimur1 authored Jan 18, 2024
2 parents 993733f + 05fffff commit 194f7a6
Show file tree
Hide file tree
Showing 5 changed files with 6,516 additions and 10,993 deletions.
47 changes: 35 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,39 @@
version: 2
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://[email protected]/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: circleci/ruby:2.4-node
- image: cimg/ruby:3.3.0-node
steps:
- checkout
- run:
name: Install Node.js dependencies
command: npm install
- run:
name: Install Ruby dependencies
command: bundle check --path=vendor/bundle || bundle install --path=vendor/bundle
- run:
name: Run tests
command: bundle exec rake --trace
- install_node_dependencies
- install_ruby_dependencies
- run_tests

workflows:
version: 2.1
ci:
jobs:
- build:
context: org-global
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@FundingCircle/team-acquire-and-frontend-platform
* @FundingCircle/team-acquire-and-frontend-platform
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var iconfont = require('gulp-iconfont');
var insert = require('gulp-insert');
var rename = require('gulp-rename');

var sass = require('gulp-sass');
var sass = require('gulp-sass')(require('sass'));
const async = require("async");
const {series, parallel} = require('gulp');

Expand Down
Loading

0 comments on commit 194f7a6

Please sign in to comment.