forked from fedi/mastodon
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>
This commit is contained in:
parent
60408fa3ef
commit
a1062df1e1
|
@ -33,9 +33,9 @@ aliases:
|
||||||
- &restore_ruby_dependencies
|
- &restore_ruby_dependencies
|
||||||
restore_cache:
|
restore_cache:
|
||||||
keys:
|
keys:
|
||||||
- v2-ruby-dependencies-{{ checksum "/tmp/.ruby-version" }}-{{ checksum "Gemfile.lock" }}
|
- v3-ruby-dependencies-{{ checksum "/tmp/.ruby-version" }}-{{ checksum "Gemfile.lock" }}
|
||||||
- v2-ruby-dependencies-{{ checksum "/tmp/.ruby-version" }}-
|
- v3-ruby-dependencies-{{ checksum "/tmp/.ruby-version" }}-
|
||||||
- v2-ruby-dependencies-
|
- v3-ruby-dependencies-
|
||||||
|
|
||||||
- &install_steps
|
- &install_steps
|
||||||
steps:
|
steps:
|
||||||
|
@ -43,13 +43,13 @@ aliases:
|
||||||
- *attach_workspace
|
- *attach_workspace
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
keys:
|
keys:
|
||||||
- v1-node-dependencies-{{ checksum "yarn.lock" }}
|
- v2-node-dependencies-{{ checksum "yarn.lock" }}
|
||||||
- v1-node-dependencies-
|
- v2-node-dependencies-
|
||||||
- run:
|
- run:
|
||||||
name: Install yarn dependencies
|
name: Install yarn dependencies
|
||||||
command: yarn install --frozen-lockfile
|
command: yarn install --frozen-lockfile
|
||||||
- save_cache:
|
- save_cache:
|
||||||
key: v1-node-dependencies-{{ checksum "yarn.lock" }}
|
key: v2-node-dependencies-{{ checksum "yarn.lock" }}
|
||||||
paths:
|
paths:
|
||||||
- ./node_modules/
|
- ./node_modules/
|
||||||
- *persist_to_workspace
|
- *persist_to_workspace
|
||||||
|
@ -61,12 +61,6 @@ aliases:
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y libicu-dev libidn11-dev libprotobuf-dev protobuf-compiler
|
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
|
- &install_ruby_dependencies
|
||||||
steps:
|
steps:
|
||||||
- *attach_workspace
|
- *attach_workspace
|
||||||
|
@ -87,7 +81,7 @@ aliases:
|
||||||
name: Install bundler dependencies
|
name: Install bundler dependencies
|
||||||
command: bundle check || (bundle install && bundle clean)
|
command: bundle check || (bundle install && bundle clean)
|
||||||
- save_cache:
|
- 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:
|
paths:
|
||||||
- ./.bundle/
|
- ./.bundle/
|
||||||
- ./vendor/bundle/
|
- ./vendor/bundle/
|
||||||
|
|
Loading…
Reference in a new issue