diff options
| author | Shlee <github@shl.ee> | 2020-05-02 05:45:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 23:45:40 +0200 |
| commit | a1062df1e1bc15d32a3afe3054d1e0063a4beb93 (patch) | |
| tree | 2c48caeff9d9b2fbb7f4e26f19bd6c577059a3bf | |
| parent | 60408fa3ef5b4aae4c46ff9c308d49ba67179bc7 (diff) | |
Fix the circleci packages for Buster. (#13583)
* Update config.yml * Update config.yml * Update config.yml * Update config.yml * Update config.yml * Update config.yml * Update config.yml * Update .circleci/config.yml Co-authored-by: Sandro <sandro.jaeckel@gmail.com> * Update config.yml Co-authored-by: Sandro <sandro.jaeckel@gmail.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
| -rw-r--r-- | .circleci/config.yml | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 03c4bcbc5..9f43a0573 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,9 +33,9 @@ aliases: - &restore_ruby_dependencies restore_cache: keys: - - v2-ruby-dependencies-{{ checksum "/tmp/.ruby-version" }}-{{ checksum "Gemfile.lock" }} - - v2-ruby-dependencies-{{ checksum "/tmp/.ruby-version" }}- - - v2-ruby-dependencies- + - v3-ruby-dependencies-{{ checksum "/tmp/.ruby-version" }}-{{ checksum "Gemfile.lock" }} + - v3-ruby-dependencies-{{ checksum "/tmp/.ruby-version" }}- + - v3-ruby-dependencies- - &install_steps steps: @@ -43,13 +43,13 @@ aliases: - *attach_workspace - restore_cache: keys: - - v1-node-dependencies-{{ checksum "yarn.lock" }} - - v1-node-dependencies- + - v2-node-dependencies-{{ checksum "yarn.lock" }} + - v2-node-dependencies- - run: name: Install yarn dependencies command: yarn install --frozen-lockfile - save_cache: - key: v1-node-dependencies-{{ checksum "yarn.lock" }} + key: v2-node-dependencies-{{ checksum "yarn.lock" }} paths: - ./node_modules/ - *persist_to_workspace @@ -61,12 +61,6 @@ aliases: sudo apt-get update sudo apt-get install -y libicu-dev libidn11-dev libprotobuf-dev protobuf-compiler - ## TODO: FIX THESE BUSTER DEPENDANCES - sudo wget http://ftp.au.debian.org/debian/pool/main/i/icu/libicu57_57.1-6+deb9u3_amd64.deb - sudo dpkg -i libicu57_57.1-6+deb9u3_amd64.deb - sudo wget http://ftp.au.debian.org/debian/pool/main/p/protobuf/libprotobuf10_3.0.0-9_amd64.deb - sudo dpkg -i libprotobuf10_3.0.0-9_amd64.deb - - &install_ruby_dependencies steps: - *attach_workspace @@ -87,7 +81,7 @@ aliases: name: Install bundler dependencies command: bundle check || (bundle install && bundle clean) - save_cache: - key: v2-ruby-dependencies-{{ checksum "/tmp/.ruby-version" }}-{{ checksum "Gemfile.lock" }} + key: v3-ruby-dependencies-{{ checksum "/tmp/.ruby-version" }}-{{ checksum "Gemfile.lock" }} paths: - ./.bundle/ - ./vendor/bundle/ |