Skip to content

Commit

Permalink
Switch to GitLab 17.2 and update nodejs and go version
Browse files Browse the repository at this point in the history
  • Loading branch information
alexandermeindl committed Jul 19, 2024
1 parent 12dda03 commit c87f671
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 6 deletions.
4 changes: 2 additions & 2 deletions roles/dendrite/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ dendrite_vhost_letsencrypt_key: '{{ letsencrypt_keys[0] | default(omit) }}'
# NOTE: version should be tests in gitlab pipeline
# SEE https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/workhorse.gitlab-ci.yml#L30
# https://go.dev/dl/ -> linux-amd64.tar.gz
dendrite_go_version: '1.21.12'
dendrite_go_version: '1.22.5'
# linux-arm64.tar.gz
dendrite_go_sha256_checksum: 94cb3ec4a1e08a00da55c33e63f725be91f10ba743907b5615ef34e54675ba2e
dendrite_go_sha256_checksum: 8d21325bfcf431be3660527c1a39d3d9ad71535fabdf5041c826e44e31642b5a

dendrite_with_validation: true
dendrite_remove: false
Expand Down
8 changes: 4 additions & 4 deletions roles/gitlab/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ gitlab_with_zsh: true
gitlab_omniauth_enabled: false
gitlab_omniauth_providers: []

gitlab_repository_version: '17-1-stable'
gitlab_repository_version: '17-2-stable'
gitlab_ce_version: '{{ gitlab_repository_version }}'
gitlab_ee_version: '{{ gitlab_repository_version }}-ee'
gitlab_path: "{{ gitlab_home }}/gitlab"
Expand Down Expand Up @@ -55,7 +55,7 @@ gitlab_node_env: production
gitlab_node_options: '--max-old-space-size=6144'
gitlab_node_prefix: "{{ npm_config_prefix | default('/usr/local/lib/npm') }}"

gitlab_nodejs_version: '18.x'
gitlab_nodejs_version: '20.x'
gitlab_nodejs_install_npm_user: git
gitlab_nodejs_npm_global_packages:
- name: yarn
Expand Down Expand Up @@ -175,8 +175,8 @@ gitlab_packages:
# NOTE: version should be tests in gitlab pipeline
# SEE https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/workhorse.gitlab-ci.yml#L30
# https://go.dev/dl/ -> linux-amd64.tar.gz
gitlab_go_version: '1.21.12'
gitlab_go_sha256_checksum: 121ab58632787e18ae0caa8ae285b581f9470d0f6b3defde9e1600e211f583c5
gitlab_go_version: '1.22.5'
gitlab_go_sha256_checksum: 904b924d435eaea086515bc63235b192ea441bd8c9b198c507e85009e6e4c7f0

gitlab_nginx_auth_realm: 'Code access is restricted'
gitlab_nginx_client_max_body_size: '0'
Expand Down
13 changes: 13 additions & 0 deletions roles/gitlab/templates/gitlab/gitlab.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,15 @@ production: &base
# <script src="https://example.com/cookie-consent.js"></script>
# <link rel="stylesheet" href="https://example.com/cookie-consent.css"/>

## Custom html header tags
# In some cases some custom header tags are needed
# e.g., to add the EU cookie consent
# Tip: you must add the externals source to the content_security_policy as
# well, typically the script_src and style_src.
# custom_html_header_tags: |
# <script src="https://example.com/cookie-consent.js"></script>
# <link rel="stylesheet" href="https://example.com/cookie-consent.css"/>

## Automatic issue closing
# If a commit message matches this regular expression, all issues referenced from the matched text will be closed.
# This happens when the commit is pushed or merged into the default branch of a project.
Expand Down Expand Up @@ -528,6 +537,10 @@ production: &base
ci_runners_stale_machines_cleanup_worker:
cron: "36 * * * *"

# Periodically queue syncing of finished pipelines from p_ci_finished_pipeline_ch_sync_events to ClickHouse
ci_click_house_finished_pipelines_sync_worker:
cron: "*/4 * * * *"

registry:
# enabled: true
# host: registry.example.com
Expand Down

0 comments on commit c87f671

Please sign in to comment.