Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enterprise to master. #1316

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
11175e2
Update OS for enterprise ship:docker
DamianSzymanski Mar 18, 2021
c73e9ee
gem updates (#1192)
GbArc Apr 21, 2021
4a759ca
trivy scan added, docker fix (#1196)
GbArc Jul 6, 2021
5ee50d2
trivy fix
GbArc Jul 7, 2021
ba2c4dc
security updates [ship:docker] (#1200)
gbarc80 Aug 2, 2021
26be255
gh update
GbArc Aug 2, 2021
a89750c
update to use latest docker
GbArc Oct 21, 2021
82d5198
added region to s3 query
GbArc Nov 23, 2021
52adedb
gh update - gh token fix (#1223)
GbArc Feb 8, 2022
b968fac
share envs to forks (#1232)
GbArc Mar 16, 2022
40153e7
extended default timeouts for db, temp workaround for tcie
GbArc May 4, 2022
95b0da0
timeout spec fix
GbArc May 4, 2022
2bce53f
Upgrade gems (#1233)
makemp May 17, 2022
41af887
removed trivy
GbArc May 17, 2022
6e817cc
gem updates (#1237)
GbArc May 17, 2022
d8b682f
w/a: removed set_tags call for raven, todo - migrate to new api'
GbArc Jun 1, 2022
eaefc8a
rack update -> 2.2.3.1
GbArc Jun 8, 2022
c12eb15
job query optimization ship:docker (#1240)
GbArc Jun 14, 2022
8d8d693
console fix after pry update
GbArc Jun 29, 2022
978635f
gem updates + extended access rights for tokens (#1246)
GbArc Aug 26, 2022
e036f1b
restarted_by feature - merge from master (#1248)
GbArc Sep 7, 2022
0bd5566
putting api on a diet (ship:docker) (#1250)
GbArc Oct 5, 2022
ef4b8f8
bump google-protobuf to 3.19.6
GbArc Oct 14, 2022
a6be270
merge from master (#1260)
GbArc Dec 14, 2022
cd697da
sinatra up to 2.2.3 (#1264)
GbArc Dec 28, 2022
415f12c
bump travis-lock, travis-settings
GbArc Jan 11, 2023
fe48847
simplecov moved to test group
GbArc Jan 11, 2023
edfd3a7
sinatra bump to 2.2.4, hostname added for cache queries
GbArc Jan 30, 2023
22f7893
activesupport up to 6.1.7.2
GbArc Feb 2, 2023
fedd96c
managing email subscriptions for whole org
gbarc-dt May 26, 2023
9deeb71
Update gem database_cleaner
Jun 26, 2023
09ac6dd
Fix for SUPP-725 ship:docker (#1295)
piccadilly-circus Aug 28, 2023
ab08a8c
[BSFY-277] Add tag_name to build request (#1305)
AndriiMysko Feb 21, 2024
c567088
API merge. Enterprise to master.
Mar 19, 2024
b3b45c1
API merge. Enterprise to master.
Mar 20, 2024
83d6944
TravisCI API merge. Enterprise to master.
Mar 21, 2024
27fec3b
TravisCI API. Review fixes.
Apr 2, 2024
063ffb3
repo spec
gbarc-dt Apr 2, 2024
e830a80
specs, ship:docker
gbarc-dt Apr 2, 2024
ad89c7b
TravisCI API. Adding libcurl library.
Apr 3, 2024
74fb28d
Merge branch 'dt-e3-0-update' of https://github.com/travis-ci/travis-…
Apr 3, 2024
e4d67d7
libcurl4 ship:docker
gbarc-dt Apr 4, 2024
ec37998
allowance for tcie ship:docker
gbarc-dt Apr 9, 2024
68eef36
allowance ship:docker
gbarc-dt Apr 9, 2024
43ef552
Dockerfile revert ship:docker
gbarc-dt Apr 12, 2024
45efe5c
endpoint updates ship:docker
gbarc-dt Apr 16, 2024
f435814
Implement legacy roles option
AndriiMysko Apr 17, 2024
b192120
test
gbarc-dt Apr 17, 2024
5721958
Merge remote-tracking branch 'origin/dt-e3-0-legacy-roles' into dt-e3…
gbarc-dt Apr 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
language: ruby
group: edge

import:
- travis-ci/build-configs:db-setup.yml
Expand All @@ -19,12 +20,11 @@ env:
- CI_NODE_INDEX=1
- CI_NODE_INDEX=2

cache: bundler

services:
- redis-server

before_install:
- 'gem install rubygems-update -v 3.4.22'
- 'gem update --system'

jobs:
Expand Down
8 changes: 6 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@ FROM ruby:3.2.2-slim

LABEL maintainer Travis CI GmbH <[email protected]>

# packages required for bundle install
RUN ( \
mkdir -p /app/vendor /app/cache; \
groupadd -r travis -g 1000 && \
useradd -u 1000 -r -g travis -s /bin/sh -c "travis user" -d "/app" travis;\
chown -R travis:travis /app; \
apt-get update ; \
apt-get install -y --no-install-recommends git make gcc g++ libpq-dev libjemalloc-dev libcurl4\
&& rm -rf /var/lib/apt/lists/* \
)

USER travis
ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2

# throw errors if Gemfile has been modified since Gemfile.lock
Expand All @@ -28,4 +32,4 @@ RUN gem install --user-install executable-hooks

COPY . /app

CMD ./script/server-buildpacks
CMD ["./script/server-buildpacks"]
44 changes: 44 additions & 0 deletions Dockerfile.tcie
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
FROM ruby:3.2.2-slim

LABEL maintainer Travis CI GmbH <[email protected]>

RUN ( \
mkdir -p /app/vendor /app/cache; \
groupadd -r travis -g 1000 && \
useradd -u 1000 -r -g travis -s /bin/sh -c "travis user" -d "/app" travis;\
chown -R travis:travis /app; \
apt-get update ; \
apt-get upgrade -y ; \
apt-get install -y --no-install-recommends git make gcc g++ libpq-dev libjemalloc-dev xz-utils \
&& rm -rf /var/lib/apt/lists/*; \
gem update --system; \
bundle config set app_config /app; \
bundle config set cache_path /app; \
bundle config --global frozen 1; \
bundle config set deployment 'true'; \
chown -R travis:travis /usr/local/bundle; \
)



WORKDIR /app

USER travis
COPY Gemfile* /app/
RUN ( \
bundle config set without 'development test'; \
bundler install --verbose --retry=3; \
bundle config set frozen true; \
)
USER root
RUN ( apt-get remove -y gcc g++ make git perl xz-utils && apt-get -y autoremove; \
bundle clean && rm -rf /app/vendor/bundle/ruby/2.7.0/cache/*; \
for i in `find /app/vendor/ -name \*.o -o -name \*.c -o -name \*.h`; do rm -f $i; done; \
)

USER travis
ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2

COPY . /app

CMD ["./script/server-buildpacks"]
39 changes: 22 additions & 17 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,56 +5,54 @@ ruby '3.2.2'
gem 'mime-types'

# travis maintained gems
gem 'travis-support', git: 'https://github.com/travis-ci/travis-support'
gem 'travis-support', git: 'https://github.com/travis-ci/travis-support', ref: '4dda53ffa96b804db22c261551256caa18c4a2cc'
gem 'travis-amqp', git: 'https://github.com/travis-ci/travis-amqp'
gem 'travis-config', git: 'https://github.com/travis-ci/travis-config'
gem 'travis-settings', git: 'https://github.com/travis-ci/travis-settings'
gem 'travis-lock', git: 'https://github.com/travis-ci/travis-lock'
gem 'travis-github_apps', git: 'https://github.com/travis-ci/travis-github_apps'
gem 'travis-settings', git: 'https://github.com/travis-ci/travis-settings', branch: 'master'
gem 'travis-lock', git: 'https://github.com/travis-ci/travis-lock/', branch: '6.1'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

master, latest updates are already merged

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

gem 'travis-github_apps', git: 'https://github.com/travis-ci/travis-github_apps', branch: 'ga-ext_access'
gem 'travis-rollout', git: 'https://github.com/travis-ci/travis-rollout'
gem 'simple_states', git: 'https://github.com/travis-ci/simple_states', branch: 'prd-ruby-upgrade-dev'
gem 'metriks', git: 'https://github.com/travis-ci/metriks'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't remove

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added

gem 'metriks-librato_metrics', git: 'https://github.com/travis-ci/metriks-librato_metrics'
gem 'marginalia', git: 'https://github.com/travis-ci/marginalia'
gem 'gh', git: 'https://github.com/travis-ci/gh'
gem 'rollout', git: 'https://github.com/travis-ci/rollout'

gem 'mustermann'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't remove

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added

gem 'sinatra'
gem 'sinatra', '~> 2'
gem 'sinatra-contrib', require: nil #git: 'https://github.com/sinatra/sinatra-contrib', require: nil

gem 'active_model_serializers' , '~> 0.9.9'
gem 'unicorn'
gem 'sentry-ruby'
gem 'yard-sinatra', git: 'https://github.com/rkh/yard-sinatra'
gem 'rack', '~> 2.2'
gem 'rack-contrib'
gem 'rack-contrib', '= 2.3.0'
gem 'rack-cache', git: 'https://github.com/rtomayko/rack-cache'
gem 'rack-attack', '~> 6'
gem 'bunny', '~> 2.22'
gem 'dalli'
gem 'pry'
gem 'http', '~> 4'
gem 'metriks', '0.9.9.6'
gem 'metriks-librato_metrics', git: 'https://github.com/eric/metriks-librato_metrics'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keep the ones from master(metriks/metriks-librato_metrics

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

gem 'librato-metrics'
gem 'simplecov'
gem 'stackprof'
gem "ipaddress", "~> 0.8.3"
gem 'nakayoshi_fork'
gem 'sidekiq'
gem 'sidekiq', '~> 6.4.0'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't pin the version to 6, current is 7.x

gem 'redis-namespace'

gem 'rbtrace'
gem 'memory_profiler'
gem 'allocation_tracer'

gem 'redlock'
gem 'rake', '~> 13.0'
gem 'rake', '~> 13.0.6'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not needed

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.


gem 'libhoney'
gem 'opencensus'
gem 'opencensus-stackdriver'

gem 'faraday', '~> 2'
gem 'faraday-net_http_persistent', '~> 2'
gem 'faraday'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs 2, now it dropped to 1.10

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

gem 'faraday-net_http_persistent'

gem 'knapsack'

Expand All @@ -67,15 +65,22 @@ gem 'tool'
gem 'google-cloud-storage'
gem 'aws-sdk-s3'
gem 'activerecord', '~> 7.0.8' # it was fixed in predicate_builder file to 7.0.6 but gh gem requires 7.0.8
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and gh gem needs update , not this one, should be 7.0.6 - otherwise api won't work

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

gem 'google-protobuf', '~> 3.19.6'
gem 'fog-aws', '~> 0.12.0'
gem 'fog-google'
gem 'coder', '~> 0.4.0'
gem 'dry-types'
gem 'dry-struct'
gem 'dry-schema'
gem 'redis', '~> 5.0'
gem 'virtus', '~> 1.0.0'
gem 'hashr'
gem 'pusher', '~> 2.0.3'
gem 'multi_json'
gem 'closeio', '~> 3.15'
gem 'closeio'
gem 'addressable', '~> 2.8.0'
gem 'rack', '~> 2.2.3'
gem 'os', '~> 1.1.4'

group :test do
gem 'rspec'
Expand All @@ -88,6 +93,7 @@ group :test do
gem 'hashdiff'
gem 'pry-byebug'
gem 'rack-test'
gem 'simplecov'
end

group :development do
Expand All @@ -100,6 +106,5 @@ group :development, :test do
gem 'rubocop', require: false
gem 'rubocop-performance', require: false
gem 'rubocop-rspec', require: false
gem 'simplecov', require: false
gem 'simplecov-console', require: false
end
Loading