Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
7a81346d
Commit
7a81346d
authored
5 years ago
by
Shlee
Committed by
Eugen Rochko
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Circleci - Upgrade to Buster Images (#12705)
* Update config.yml * Update Gemfile.lock
parent
0e8c0287
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.circleci/config.yml
+13
-13
13 additions, 13 deletions
.circleci/config.yml
Gemfile.lock
+0
-6
0 additions, 6 deletions
Gemfile.lock
with
13 additions
and
19 deletions
.circleci/config.yml
+
13
−
13
View file @
7a81346d
...
...
@@ -3,7 +3,7 @@ version: 2
aliases
:
-
&defaults
docker
:
-
image
:
circleci/ruby:2.6-
stretch
-node
-
image
:
circleci/ruby:2.6-
buster
-node
environment
:
&ruby_environment
BUNDLE_APP_CONFIG
:
./.bundle/
DB_HOST
:
localhost
...
...
@@ -39,7 +39,6 @@ aliases:
steps
:
-
checkout
-
*attach_workspace
-
restore_cache
:
keys
:
-
v1-node-dependencies-{{ checksum "yarn.lock" }}
...
...
@@ -49,7 +48,6 @@ aliases:
key
:
v1-node-dependencies-{{ checksum "yarn.lock" }}
paths
:
-
./node_modules/
-
*persist_to_workspace
-
&install_system_dependencies
...
...
@@ -58,13 +56,17 @@ aliases:
command
:
|
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
-
*install_system_dependencies
-
run
:
ruby -e 'puts RUBY_VERSION' | tee /tmp/.ruby-version
-
*restore_ruby_dependencies
-
run
:
bundle install --clean --jobs 16 --path ./vendor/bundle/ --retry 3 --with pam_authentication --without development production && bundle clean
...
...
@@ -82,10 +84,8 @@ aliases:
-
&test_steps
steps
:
-
*attach_workspace
-
*install_system_dependencies
-
run
:
sudo apt-get install -y ffmpeg
-
run
:
name
:
Prepare Tests
command
:
./bin/rails parallel:create parallel:load_schema parallel:prepare
...
...
@@ -105,14 +105,14 @@ jobs:
install-ruby2.5
:
<<
:
*defaults
docker
:
-
image
:
circleci/ruby:2.5-
stretch
-node
-
image
:
circleci/ruby:2.5-
buster
-node
environment
:
*ruby_environment
<<
:
*install_ruby_dependencies
install-ruby2.4
:
<<
:
*defaults
docker
:
-
image
:
circleci/ruby:2.4-
stretch
-node
-
image
:
circleci/ruby:2.4-
buster
-node
environment
:
*ruby_environment
<<
:
*install_ruby_dependencies
...
...
@@ -131,7 +131,7 @@ jobs:
test-ruby2.6
:
<<
:
*defaults
docker
:
-
image
:
circleci/ruby:2.6-
stretch
-node
-
image
:
circleci/ruby:2.6-
buster
-node
environment
:
*ruby_environment
-
image
:
circleci/postgres:10.6-alpine
environment
:
...
...
@@ -142,7 +142,7 @@ jobs:
test-ruby2.5
:
<<
:
*defaults
docker
:
-
image
:
circleci/ruby:2.5-
stretch
-node
-
image
:
circleci/ruby:2.5-
buster
-node
environment
:
*ruby_environment
-
image
:
circleci/postgres:10.6-alpine
environment
:
...
...
@@ -153,7 +153,7 @@ jobs:
test-ruby2.4
:
<<
:
*defaults
docker
:
-
image
:
circleci/ruby:2.4-
stretch
-node
-
image
:
circleci/ruby:2.4-
buster
-node
environment
:
*ruby_environment
-
image
:
circleci/postgres:10.6-alpine
environment
:
...
...
@@ -164,7 +164,7 @@ jobs:
test-webui
:
<<
:
*defaults
docker
:
-
image
:
circleci/node:12
.9-stretch
-
image
:
circleci/node:12
-buster
steps
:
-
*attach_workspace
-
run
:
./bin/retry yarn test:jest
...
...
This diff is collapsed.
Click to expand it.
Gemfile.lock
+
0
−
6
View file @
7a81346d
...
...
@@ -803,9 +803,3 @@ DEPENDENCIES
webmock (~> 3.7)
webpacker (~> 4.2)
webpush
RUBY VERSION
ruby 2.6.5p114
BUNDLED WITH
1.17.3
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment