diff --git a/.gitlab/ci/release-environments/main.gitlab-ci.yml b/.gitlab/ci/release-environments/main.gitlab-ci.yml index 731de957221..c02c3b9e086 100644 --- a/.gitlab/ci/release-environments/main.gitlab-ci.yml +++ b/.gitlab/ci/release-environments/main.gitlab-ci.yml @@ -37,7 +37,7 @@ release-environments-deploy-env: variables: DEPLOY_ENV: deploy.env script: - - ./scripts/construct-release-environments-versions.rb > $DEPLOY_ENV + - ./scripts/release-environment/construct-release-environments-versions.rb artifacts: reports: dotenv: $DEPLOY_ENV diff --git a/Gemfile b/Gemfile index 61110d45b49..c5c4f0424d7 100644 --- a/Gemfile +++ b/Gemfile @@ -206,7 +206,7 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-core', '~> 3.194.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-core', '~> 3.194.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-s3', '~> 1.149.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/Gemfile.checksum b/Gemfile.checksum index f3152d62885..d1dfe3a63be 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -36,7 +36,7 @@ {"name":"aws-eventstream","version":"1.3.0","platform":"ruby","checksum":"f1434cc03ab2248756eb02cfa45e900e59a061d7fbdc4a9fd82a5dd23d796d3f"}, {"name":"aws-partitions","version":"1.877.0","platform":"ruby","checksum":"9552ed7bbd3700ed1eeb0121c160ceaf64fa5dbaff5a1ff5fe6fd8481ecd9cfd"}, {"name":"aws-sdk-cloudformation","version":"1.41.0","platform":"ruby","checksum":"31e47539719734413671edf9b1a31f8673fbf9688549f50c41affabbcb1c6b26"}, -{"name":"aws-sdk-core","version":"3.194.0","platform":"ruby","checksum":"ac34863f3fa0f60b11896361fb8ac85fe16674111c6f811ca27b463405bfe6f6"}, +{"name":"aws-sdk-core","version":"3.194.1","platform":"ruby","checksum":"3ac7a3d6b872ae69ded6ee0394e3b64645dde1f7c78e123b7dd84700d392607a"}, {"name":"aws-sdk-kms","version":"1.76.0","platform":"ruby","checksum":"e7f75013cba9ba357144f66bbc600631c192e2cda9dd572794be239654e2cf49"}, {"name":"aws-sdk-s3","version":"1.149.0","platform":"ruby","checksum":"17c0f00bad32f2c6b281e827252746b64812bdcabdc44cda59e6170c1d53b410"}, {"name":"aws-sigv4","version":"1.8.0","platform":"ruby","checksum":"84dd99768b91b93b63d1d8e53ee837cfd06ab402812772a7899a78f9f9117cbc"}, diff --git a/Gemfile.lock b/Gemfile.lock index a8f5241a9f2..bb5cbb37fd4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -303,7 +303,7 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.194.0) + aws-sdk-core (3.194.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -1931,7 +1931,7 @@ DEPENDENCIES attr_encrypted (~> 3.2.4)! awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.194.0) + aws-sdk-core (~> 3.194.1) aws-sdk-s3 (~> 1.149.0) axe-core-rspec (~> 4.9.0) babosa (~> 2.0) diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 63a0aceac4e..b0d242722bd 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -346,14 +346,6 @@ $gl-btn-small-line-height: 18px; */ $badge-bg: rgba($black, 0.07); -/* -* Social Icons -*/ -$discord: #5865f2; -$linkedin: #2867b2; -$mastodon: #6364ff; -$skype: #0078d7; - /* * Award emoji */ diff --git a/app/assets/stylesheets/page_bundles/profile.scss b/app/assets/stylesheets/page_bundles/profile.scss index d19d6a4841f..ee59c8ee781 100644 --- a/app/assets/stylesheets/page_bundles/profile.scss +++ b/app/assets/stylesheets/page_bundles/profile.scss @@ -117,26 +117,6 @@ } } -.linkedin-icon { - color: $linkedin; -} - -.skype-icon { - color: $skype; -} - -.x-icon { - color: var(--gl-text-color, $gl-text-color); -} - -.discord-icon { - color: $discord; -} - -.mastodon-icon { - color: $mastodon; -} - .key-created-at { line-height: 42px; } diff --git a/scripts/construct-release-environments-versions.rb b/scripts/release_environment/construct-release-environments-versions.rb similarity index 67% rename from scripts/construct-release-environments-versions.rb rename to scripts/release_environment/construct-release-environments-versions.rb index 7f8fa103def..55a2da5d149 100755 --- a/scripts/construct-release-environments-versions.rb +++ b/scripts/release_environment/construct-release-environments-versions.rb @@ -25,13 +25,31 @@ class ReleaseEnvironmentsModel end JSON.generate(output_json) end + + def set_required_env_vars? + required_env_vars = %w[DEPLOY_ENV] + + required_env_vars.each do |var| + if ENV.fetch(var, nil).to_s.empty? + puts "Missing required environment variable: #{var}" + return false + end + end + end end # Outputs in `dotenv` format the ENVIRONMENT and VERSIONS to pass to release environments e.g. # ENVIRONMENT=15-10-stable # VERSIONS={"gitaly":"15-10-stable-c7c5131c","registry":"15-10-stable-c7c5131c","kas":"15-10-stable-c7c5131c", ... if $PROGRAM_NAME == __FILE__ + model = ReleaseEnvironmentsModel.new + raise "Missing required environment variable." unless model.set_required_env_vars? + environment = ENV['CI_COMMIT_REF_SLUG'].sub("-ee", "") - puts "ENVIRONMENT=#{environment}" - puts "VERSIONS=#{ReleaseEnvironmentsModel.new.generate_json(environment)}" + File.open(ENV['DEPLOY_ENV'], 'w') do |file| + file.puts "ENVIRONMENT=#{environment}" + file.puts "VERSIONS=#{model.generate_json(environment)}" + end + + puts File.read(ENV['DEPLOY_ENV']) end