diff --git a/.circleci/config.yml b/.circleci/config.yml index c0c713f..c4e01b5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,9 @@ -version: 2 +version: 2.1 + +orbs: + ruby: circleci/ruby@1.0 + node: circleci/node@2 + jobs: build: docker: @@ -20,6 +25,7 @@ jobs: steps: - checkout + - ruby/install-deps - run: name: "echo an env var that is part of QI-PS test context" command: | @@ -29,31 +35,6 @@ jobs: keys: - qi-ps-bundle-v1-{{ checksum "Gemfile.lock" }} - qi-ps-bundle-v1- - - run: - name: install dependencies - command: | - sudo apt-get update -qq && sudo apt-get -y install \ - autoconf \ - automake \ - build-essential \ - cmake \ - git-core \ - libass-dev \ - libfreetype6-dev \ - libgnutls28-dev \ - libsdl2-dev \ - libtool \ - libva-dev \ - libvdpau-dev \ - libvorbis-dev \ - libxcb1-dev \ - libxcb-shm0-dev \ - libxcb-xfixes0-dev \ - pkg-config \ - texinfo \ - wget \ - yasm \ - zlib1g-dev - run: name: install ffmpeg @@ -62,10 +43,8 @@ jobs: - run: name: install dependencies command: | - bundle -v - sudo gem install bundler:2.1.4 --default - bundle -v - bundle check || bundle install + gem install bundler:2.1.4 --default + bundle install - save_cache: key: qi-ps-bundle-v1-{{ checksum "Gemfile.lock" }} diff --git a/yarn.lock b/yarn.lock index 479b348..c69041c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7413,9 +7413,9 @@ urix@^0.1.0: integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= url-parse@^1.4.3, url-parse@^1.4.7: - version "1.5.1" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b" - integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q== + version "1.5.7" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.7.tgz#00780f60dbdae90181f51ed85fb24109422c932a" + integrity sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA== dependencies: querystringify "^2.1.1" requires-port "^1.0.0"