diff --git a/CHANGELOG.md b/CHANGELOG.md index 1be2927027..ae436eb89c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,54 @@ The latest version of this file can be found at the master branch of the omnibus-gitlab repository. +## 18.3.1 (2025-08-26) + +### Fixed (1 change) + +- [Update Mattermost to v10.10.2](gitlab-org/security/omnibus-gitlab@188ca72d1d89b17c087709c380ca212d0f656cd4) + +## 18.3.0 (2025-08-20) + +### Added (6 changes) + +- [Feat: add registry database auto-migrations](gitlab-org/omnibus-gitlab@374c8a96e6033ecb9f7f1f781cbd20e2b23b3641) ([merge request](gitlab-org/omnibus-gitlab!8592)) +- [Add container registry reporting config](gitlab-org/omnibus-gitlab@56b66271ffd5e825692b7339055273fc4fde0674) by @bufferoverflow ([merge request](gitlab-org/omnibus-gitlab!8548)) +- [Build and ship fast-stats](gitlab-org/omnibus-gitlab@2c9e9652c214bd7f12c67bbe5d334913ceb6d8c2) ([merge request](gitlab-org/omnibus-gitlab!8618)) +- [Automatically create registry database as part of reconfigure](gitlab-org/omnibus-gitlab@9d5b887e80e6139c8a54e30425ff87cfc8e507b7) ([merge request](gitlab-org/omnibus-gitlab!8491)) +- [Add gitlabsos script to Linux package](gitlab-org/omnibus-gitlab@df27402b6ae66fff725662e16e8ec04cf72155b9) ([merge request](gitlab-org/omnibus-gitlab!8565)) +- [Add container registry load balancing config](gitlab-org/omnibus-gitlab@2ba8e5321d7d550fac5d068995f8139f1683988d) ([merge request](gitlab-org/omnibus-gitlab!8468)) + +### Fixed (1 change) + +- [Fix deprecation check failing on nil values](gitlab-org/omnibus-gitlab@a773d76dce05fba0bd027359dadfaa57da750d79) ([merge request](gitlab-org/omnibus-gitlab!8616)) + +### Changed (16 changes) + +- [Feat: base postgresql settings on registry database settings](gitlab-org/omnibus-gitlab@30706511bb054b4d35c7545577ad04e9416ffd72) ([merge request](gitlab-org/omnibus-gitlab!8623)) +- [Build with Go 1.24.5](gitlab-org/omnibus-gitlab@55311babf2451aa0c51f4018ff4c62501ac27fd4) ([merge request](gitlab-org/omnibus-gitlab!8657)) +- [Update gitlabsos digest to ccb1edb](gitlab-org/omnibus-gitlab@2fb229cf3116135cb6b7bb715f353618460d4c87) ([merge request](gitlab-org/omnibus-gitlab!8609)) +- [Update logo used in installation script messages](gitlab-org/omnibus-gitlab@171e423516bd019958348dfa951e9426a0c7a3f4) ([merge request](gitlab-org/omnibus-gitlab!8485)) +- [Update dependency redis to v7.2.10](gitlab-org/omnibus-gitlab@62200d53fa0b751789c61a26bbf61065c3087fca) ([merge request](gitlab-org/omnibus-gitlab!8613)) +- [Update rack to 2.2.17](gitlab-org/omnibus-gitlab@7c6fef50f262ac3d80c4878b5c654982d89d122e) ([merge request](gitlab-org/omnibus-gitlab!8612)) +- [Update Ruby version to 3.2.8](gitlab-org/omnibus-gitlab@710817a0e310e3d99b8ea3b62c4e735e1fdcd75e) ([merge request](gitlab-org/omnibus-gitlab!8605)) +- [Update Ruby version from 3.2.5 to 3.2.6](gitlab-org/omnibus-gitlab@8fc8f87370b0650802765be2798be50493cdcb4b) ([merge request](gitlab-org/omnibus-gitlab!8601)) +- [Update Mattermost to version 10.10.1](gitlab-org/omnibus-gitlab@ae0bc2f1760538cb46a9f2817f5c73f34238f3a7) by @christian.hueser.hzdr ([merge request](gitlab-org/omnibus-gitlab!8602)) +- [Update dependency bundler to v2.7.1](gitlab-org/omnibus-gitlab@5a07303ecea4c972205e4d6452fb46e82c7284e0) ([merge request](gitlab-org/omnibus-gitlab!8572)) +- [Update dependency container-registry to v4.25.0-gitlab](gitlab-org/omnibus-gitlab@2f06609c5080f5a336f63fe53eaf36580e28592d) ([merge request](gitlab-org/omnibus-gitlab!8578)) +- [Update dependency libxml2 to v2.14.5](gitlab-org/omnibus-gitlab@b4021b2ecf8330cae9ff5f5976283a68a345260a) ([merge request](gitlab-org/omnibus-gitlab!8569)) +- [Update dependency nginx/nginx to release-1.29.0](gitlab-org/omnibus-gitlab@edc81f116606e2c7d4051e140a51faba1c0ea840) ([merge request](gitlab-org/omnibus-gitlab!8557)) +- [Update dependency redis-exporter to v1.74.0](gitlab-org/omnibus-gitlab@af1b5974b7b28defd2368407cf7b2c467bfbb26b) ([merge request](gitlab-org/omnibus-gitlab!8472)) +- [Update dependency libpng to v1.6.50](gitlab-org/omnibus-gitlab@f0f53098d84e9bc0989764a8ee5412fb8e38d831) ([merge request](gitlab-org/omnibus-gitlab!8453)) +- [Update dependency acme-client to v2.0.22](gitlab-org/omnibus-gitlab@f72174610ef609aeab10512dc00f801bd7897057) ([merge request](gitlab-org/omnibus-gitlab!8530)) + +### Deprecated (1 change) + +- [Deprecate bin_path and use_bundled_binaries in Gitaly config](gitlab-org/omnibus-gitlab@9c6c031d35b0876511df8292bbf9bf54bbe192be) ([merge request](gitlab-org/omnibus-gitlab!8549)) + +### Other (1 change) + +- [Update pages max_uri_length to 2048 in gitlab.rb template](gitlab-org/omnibus-gitlab@577648c9b2d3e956101627df5ddad46ddaf7a3d7) ([merge request](gitlab-org/omnibus-gitlab!8626)) + ## 18.2.2 (2025-08-12) ### Fixed (1 change) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 1f7391f92b..960ae41316 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -master +18.3.1 \ No newline at end of file diff --git a/GITLAB_ELASTICSEARCH_INDEXER_VERSION b/GITLAB_ELASTICSEARCH_INDEXER_VERSION index ba2906d066..3b867ccd76 100644 --- a/GITLAB_ELASTICSEARCH_INDEXER_VERSION +++ b/GITLAB_ELASTICSEARCH_INDEXER_VERSION @@ -1 +1 @@ -main +5.7.0 \ No newline at end of file diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION index 1f7391f92b..960ae41316 100644 --- a/GITLAB_KAS_VERSION +++ b/GITLAB_KAS_VERSION @@ -1 +1 @@ -master +18.3.1 \ No newline at end of file diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index 1f7391f92b..960ae41316 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -master +18.3.1 \ No newline at end of file diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index ba2906d066..5c5b951eaf 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -main +14.44.0 \ No newline at end of file diff --git a/VERSION b/VERSION index 1f7391f92b..0d665a45d5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -master +18.3.1-ee \ No newline at end of file diff --git a/config/software/mattermost.rb b/config/software/mattermost.rb index 33acaee189..8c9b2d0d00 100644 --- a/config/software/mattermost.rb +++ b/config/software/mattermost.rb @@ -18,10 +18,10 @@ name 'mattermost' -default_version '10.10.1' +default_version '10.10.2' source url: "https://releases.mattermost.com/#{version}/mattermost-team-#{version}-linux-amd64.tar.gz", - sha256: '1a8108227cd7c79c66f7f45c52a06a255c327f7607bc65da9276200713f9e5b2' + sha256: '57d58210339189349d2d67ab684a2c34aabfeed563983060598aa9f4af1b426e' relative_path 'mattermost' license_name = 'GITLAB-MATTERMOST-COMPILED-LICENSE.txt' diff --git a/gitlab-ci-config/variables.yml b/gitlab-ci-config/variables.yml index b27fb1aff6..15a1bcb9b4 100644 --- a/gitlab-ci-config/variables.yml +++ b/gitlab-ci-config/variables.yml @@ -1,59 +1,49 @@ --- variables: - # BUILDER_IMAGE_REGISTRY is set to - # `dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder` in the project - # settings of omnibus-gitlab mirror in dev.gitlab.org so that builds there - # will use images from that registry and not depend on GitLab.com - BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder" - # To be used for images that exist only on dev.gitlab.org - DEV_BUILDER_IMAGE_REGISTRY: 'dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder' - PUBLIC_BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder" - BUILDER_IMAGE_REVISION: "5.39.0" - # The registry to pull the assets image from + BUILDER_IMAGE_REGISTRY: registry.gitlab.com/gitlab-org/gitlab-omnibus-builder + DEV_BUILDER_IMAGE_REGISTRY: dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder + PUBLIC_BUILDER_IMAGE_REGISTRY: registry.gitlab.com/gitlab-org/gitlab-omnibus-builder + BUILDER_IMAGE_REVISION: 5.39.0 ASSET_REGISTRY: "${CI_REGISTRY}" - ASSET_SYNC_EXISTING_REMOTE_FILES: "keep" - ASSET_SYNC_GZIP_COMPRESSION: "true" - ASSET_PATH: "assets-${CI_COMMIT_REF_SLUG}" - COMPILE_ASSETS: "false" - BUNDLE_PATH__SYSTEM: "false" - # CI images - DOCKERHUB_PREFIX: "docker.io" # Set to dependency proxy if rate limits become a problem. + ASSET_SYNC_EXISTING_REMOTE_FILES: keep + ASSET_SYNC_GZIP_COMPRESSION: 'true' + ASSET_PATH: assets-${CI_COMMIT_REF_SLUG} + COMPILE_ASSETS: 'false' + BUNDLE_PATH__SYSTEM: 'false' + DOCKERHUB_PREFIX: docker.io RUBY_IMAGE: "${DOCKERHUB_PREFIX}/ruby:3.2" RUBY_ALPINE_IMAGE: "${RUBY_IMAGE}-alpine" BASH_IMAGE: "${DOCKERHUB_PREFIX}/bash:5.2-alpine3.20" ALPINE_IMAGE: "${DOCKERHUB_PREFIX}/alpine:3.21" UBUNTU_IMAGE: "${DOCKERHUB_PREFIX}/ubuntu:24.04" DOCKER_DIND_IMAGE: "${DOCKERHUB_PREFIX}/docker:28.0.4-dind" - DEPENDENCY_PROXY_LOGIN: "false" - # Format of the auto-deploy tag for auto-deploy builds. - # https://gitlab.com/gitlab-org/release/docs/blob/master/general/deploy/auto-deploy.md#auto-deploy-tagging - AUTO_DEPLOY_TAG_REGEX: '^\d+\.\d+\.\d+\+[^ ]{7,}\.[^ ]{7,}$' - # Default environment for auto-deploy - AUTO_DEPLOY_ENVIRONMENT: 'pre' - OMNIBUS_GITLAB_MIRROR_ID: "14588374" - DOCS_GITLAB_REPO_SUFFIX: "omnibus" + DEPENDENCY_PROXY_LOGIN: 'false' + AUTO_DEPLOY_TAG_REGEX: "^\\d+\\.\\d+\\.\\d+\\+[^ ]{7,}\\.[^ ]{7,}$" + AUTO_DEPLOY_ENVIRONMENT: pre + OMNIBUS_GITLAB_MIRROR_ID: '14588374' + DOCS_GITLAB_REPO_SUFFIX: omnibus DOCS_LINT_IMAGE: registry.gitlab.com/gitlab-org/technical-writing/docs-gitlab-com/lint-markdown:alpine-3.21-vale-3.11.2-markdownlint2-0.17.2-lychee-0.18.1 - CACHE_KEY_SUFFIX: '-v3' - CACHE_EDITION: "CE" - CACHE_POLICY: 'pull-push' - ISSUE_BOT_LABELS_EXTRA: "group::distribution" - BUNDLER_VERSION: "2.7.1" - GET_GEO_TAG: "0.7.4" - GITLAB_NAMESPACE: "gitlab-org" - CANONICAL_PROJECT_PATH: 'gitlab-org/omnibus-gitlab' - SECURITY_PROJECT_PATH: 'gitlab-org/security/omnibus-gitlab' - DEV_PROJECT_PATH: 'gitlab/omnibus-gitlab' - QA_PROJECT_PATH: 'gitlab-org/build/omnibus-gitlab-mirror' - ARM64_RUNNER_TAG: 'arm64' - PACKAGE_PROMOTION_RUNNER_TAG: 'promotion' - NIGHTLY_REPO: 'nightly-builds' - NIGHTLY_FIPS_REPO: 'nightly-fips-builds' - QA_TESTS_UPSTREAM_PROJECT: 'gitlab-org/gitlab' - QA_TESTS_REF: 'master' - OPENSSL_VERSION: '3.4.1' + CACHE_KEY_SUFFIX: "-v3" + CACHE_EDITION: CE + CACHE_POLICY: pull-push + ISSUE_BOT_LABELS_EXTRA: group::distribution + BUNDLER_VERSION: 2.7.1 + GET_GEO_TAG: 0.7.4 + GITLAB_NAMESPACE: gitlab-org + CANONICAL_PROJECT_PATH: gitlab-org/omnibus-gitlab + SECURITY_PROJECT_PATH: gitlab-org/security/omnibus-gitlab + DEV_PROJECT_PATH: gitlab/omnibus-gitlab + QA_PROJECT_PATH: gitlab-org/build/omnibus-gitlab-mirror + ARM64_RUNNER_TAG: arm64 + PACKAGE_PROMOTION_RUNNER_TAG: promotion + NIGHTLY_REPO: nightly-builds + NIGHTLY_FIPS_REPO: nightly-fips-builds + QA_TESTS_UPSTREAM_PROJECT: gitlab-org/security/gitlab + QA_TESTS_REF: 18-3-stable-ee + OPENSSL_VERSION: 3.4.1 FF_TIMESTAMPS: true - OPENSSL_GEM_VERSION: '~> 3.2.0' - RAT_PROJECT_PATH: 'gitlab-org/distribution/reference-architecture-tester' + OPENSSL_GEM_VERSION: "~> 3.2.0" + RAT_PROJECT_PATH: gitlab-org/distribution/reference-architecture-tester DISABLE_RPI_BUILDS: 'true' - PUBLIC_IMAGE_ARCHIVE_REGISTRY: 'registry.gitlab.com' - PUBLIC_IMAGE_ARCHIVE_REGISTRY_PATH: 'gitlab-org/public-image-archive' + PUBLIC_IMAGE_ARCHIVE_REGISTRY: registry.gitlab.com + PUBLIC_IMAGE_ARCHIVE_REGISTRY_PATH: gitlab-org/public-image-archive diff --git a/spec/lib/gitlab/build_iteration_spec.rb b/spec/lib/gitlab/build_iteration_spec.rb index aa22727035..460dd33fa8 100644 --- a/spec/lib/gitlab/build_iteration_spec.rb +++ b/spec/lib/gitlab/build_iteration_spec.rb @@ -63,7 +63,7 @@ subject { Gitlab::BuildIteration.new } it 'returns 0' do - allow(Build::Check).to receive(:system).with('git describe --exact-match > /dev/null 2>&1').and_return(false) + allow(Build::Check).to receive(:on_tag?).and_return(false) expect(subject.build_iteration).to eq('0') end end