Skip to content
Snippets Groups Projects
Commit e23c81e59e38 authored by Georges Racinet's avatar Georges Racinet :squid:
Browse files

heptapod#2004: making 17.7 the new stable

No related branches found
No related tags found
No related merge requests found
Showing
with 122 additions and 27 deletions
......@@ -82,7 +82,7 @@
# package edition (CE/EE). For child pipelines from
# TRIGGERED_(CE|EE)_PIPELINE, we don't want exit early, but try to build
# everything.
- if [[ "${CI_PIPELINE_SOURCE}" != "parent_pipeline" ]]; then
- if [[ "${CI_PIPELINE_SOURCE}" != "parent_pipeline" ]] && [[ "${CI_PIPELINE_SOURCE}" != "pipeline" ]]; then
export CE_ONLY=(Raspberry);
export EE_ONLY=(SLES RAT);
for job in "${CE_ONLY[@]}"; do
......
......@@ -53,3 +53,5 @@
* Copy the contents of the test plan here.
-->
/assign me
......@@ -42,3 +42,5 @@
- [ ] Integration tests added to [GitLab QA](https://gitlab.com/gitlab-org/gitlab-qa).
- [ ] Equivalent MR/issue for the [GitLab Chart](https://gitlab.com/gitlab-org/charts/gitlab) opened.
- [ ] Validate potential values for new configuration settings. Formats such as integer `10`, duration `10s`, URI `scheme://user:passwd@host:port` may require quotation or other special handling when rendered in a template and written to a configuration file.
/assign me
......@@ -38,3 +38,5 @@
- [ ] Tests updated
- [ ] Equivalent MR/issue for the [GitLab Chart](https://gitlab.com/gitlab-org/charts/gitlab) opened
- [ ] Notify Product for inclusion in release notes
/assign me
......@@ -31,3 +31,5 @@
[Code Review process]: https://docs.gitlab.com/ee/development/code_review.html
[quick actions]: https://docs.gitlab.com/ee/user/project/quick_actions.html#quick-actions-for-issues-merge-requests-and-epics
[CHANGELOG entry]: https://docs.gitlab.com/ee/development/changelog.html#overview
/assign me
......@@ -201,3 +201,4 @@
e091df0d21ef58017000ee6b9a0673c566318ca3 heptapod-17.4.0.pre-1
b4473a03d539c31f5eacdd5f3f6b9cd2aaf92456 heptapod-17.5.0.pre-1
30b570072c8ad3943c036d469b216bb2d4b6d6a6 heptapod-17.6.0.pre-1
e1f420184ce08eff5e2a51218f57a0bc8e1f9a5e heptapod-17.7.0.pre-1
......@@ -3,6 +3,55 @@
The latest version of this file can be found at the master branch of the
omnibus-gitlab repository.
## 17.6.2 (2024-12-10)
No changes.
## 17.6.1 (2024-11-26)
No changes.
## 17.6.0 (2024-11-20)
### Added (2 changes)
- [Build packages for OpenSUSE Leap 15.6](gitlab-org/omnibus-gitlab@b59f129da304ebaca649f3f3a79dc4e41babdd20) ([merge request](gitlab-org/omnibus-gitlab!7993))
- [Add Gitaly role](gitlab-org/omnibus-gitlab@650266f8d4941af54a3531e49365c074cb399ad0) ([merge request](gitlab-org/omnibus-gitlab!7942))
### Fixed (2 changes)
- [Make ActionCable Redis settings use default Redis Sentinel password](gitlab-org/omnibus-gitlab@1acd2a70d0e30ad84d0724c66d5cdc6cb8c1819b) ([merge request](gitlab-org/omnibus-gitlab!7945))
- [Ensure PostgreSQL 16 is included in GitLab CE](gitlab-org/omnibus-gitlab@4bd75976c0ad0695ed9847ed43ffc6c44fb86741) ([merge request](gitlab-org/omnibus-gitlab!7994))
### Changed (14 changes)
- [Update dependency exiftool to v12.99](gitlab-org/omnibus-gitlab@f5ab7cf69b2b1f3e566963187c299247e2aea99a) by @gitlab-dependency-update-bot ([merge request](gitlab-org/omnibus-gitlab!8014))
- [Update dependency prometheus to v2.55.1](gitlab-org/omnibus-gitlab@6bf9433f7f70b54ff3cebd5f25b1174e27075109) by @gitlab-dependency-update-bot ([merge request](gitlab-org/omnibus-gitlab!8016))
- [Update dependency curl to 8.11.0](gitlab-org/omnibus-gitlab@b1046b08eca4081814633fe36d503713c66eec22) by @gitlab-dependency-update-bot ([merge request](gitlab-org/omnibus-gitlab!8023))
- [Update nginx to release 1.27.1](gitlab-org/omnibus-gitlab@8079a493abdba776db5ff4b7303721eb8f572f56) ([merge request](gitlab-org/omnibus-gitlab!8007))
- [Update dependency redis-exporter to v1.66.0](gitlab-org/omnibus-gitlab@159fa53f6c701e89e3abbe5d098d8424b18e5f52) ([merge request](gitlab-org/omnibus-gitlab!8021))
- [Update dependency rubygems to v3.5.23](gitlab-org/omnibus-gitlab@34d4840350cfc3a35dd472caa8ad23ae8d986791) ([merge request](gitlab-org/omnibus-gitlab!8020))
- [Update logrotate from 3.21.0 to 3.22.0](gitlab-org/omnibus-gitlab@ef237f5cec3648bd6498c0b3944cd98a0bc0393f) ([merge request](gitlab-org/omnibus-gitlab!7659))
- [Update dependency registry to v4.13.0-gitlab](gitlab-org/omnibus-gitlab@4c35930db3e517d59f70079b5df7f1f308e24978) ([merge request](gitlab-org/omnibus-gitlab!8017))
- [Update dependency registry to v4.12.0-gitlab](gitlab-org/omnibus-gitlab@026f420403af439a65530662630939f9bea7788c) ([merge request](gitlab-org/omnibus-gitlab!8000))
- [Update dependency pgbouncer_exporter to v0.10.2](gitlab-org/omnibus-gitlab@f28b1e336e2bb09169141ea8ca22b3d8181c8567) ([merge request](gitlab-org/omnibus-gitlab!8005))
- [Update dependency redis-exporter to v1.65.0](gitlab-org/omnibus-gitlab@f4a24ddb52cc8661e0c8f91b66a2ce359032e5b2) ([merge request](gitlab-org/omnibus-gitlab!7969))
- [Update dependency pgbouncer_exporter to v0.10.1](gitlab-org/omnibus-gitlab@db1ce382622b657d05744a4e860835d290c9502e) ([merge request](gitlab-org/omnibus-gitlab!7971))
- [Update dependency libarchive/libarchive to v3.7.7](gitlab-org/omnibus-gitlab@9266d1152e9b5da0623e6d4084e3584117506249) ([merge request](gitlab-org/omnibus-gitlab!7989))
- [Update dependency rubygems to v3.5.18](gitlab-org/omnibus-gitlab@2829d736aa82219a0879ffe886610eef315b9b02) ([merge request](gitlab-org/omnibus-gitlab!7885))
### Removed (1 change)
- [Stop building Debian 10 packages](gitlab-org/omnibus-gitlab@85810e56f20374ed463aed067bd1d2e058f41622) ([merge request](gitlab-org/omnibus-gitlab!7990))
## 17.5.4 (2024-12-10)
No changes.
## 17.5.3 (2024-11-26)
No changes.
## 17.5.2 (2024-11-12)
### Security (1 change)
......@@ -54,6 +103,14 @@
- [Improve Patroni role detection message](gitlab-org/omnibus-gitlab@f5daf8f1ae2cf9c5f64d3b8a51272232281ab825) ([merge request](gitlab-org/omnibus-gitlab!7939))
## 17.4.6 (2024-12-10)
No changes.
## 17.4.5 (2024-11-26)
No changes.
## 17.4.4 (2024-11-12)
### Security (1 change)
......
......@@ -6,10 +6,10 @@
## Developer Certificate of Origin + License
By contributing to GitLab B.V., You accept and agree to the following terms and
conditions for Your present and future Contributions submitted to GitLab B.V.
Except for the license granted herein to GitLab B.V. and recipients of software
distributed by GitLab B.V., You reserve all right, title, and interest in and to
By contributing to GitLab Inc., You accept and agree to the following terms and
conditions for Your present and future Contributions submitted to GitLab Inc.
Except for the license granted herein to GitLab Inc. and recipients of software
distributed by GitLab Inc., You reserve all right, title, and interest in and to
Your Contributions. All Contributions are subject to the following DCO + License
terms.
......
master
b8f99a26d6474a32d13509ea7376e96ab084f992
\ No newline at end of file
main
5.4.0
\ No newline at end of file
master
f8244aad21dc8556295be46da032a6ab26bccf56
\ No newline at end of file
master
7999217addae25ef054b769e74265cbd2ad28bad
\ No newline at end of file
main
14.39.0
\ No newline at end of file
17.6.0.pre
17.7.0.pre
......@@ -109,7 +109,7 @@
allowed_lib /libatomic.so.1/ if OhaiHelper.raspberry_pi?
end
# FIPs requires system OpenSSL packages to run
# FIPS requires system OpenSSL packages to run
if Build::Check.use_system_ssl?
if rhel?
runtime_dependency 'openssl-perl'
......@@ -118,6 +118,17 @@
end
end
# FIPS requires system libgcrypt packages to run.
if Build::Check.use_system_libgcrypt?
allowed_lib /libgcrypt\.so/
if rhel?
runtime_dependency 'libgcrypt'
else
runtime_dependency 'libgcrypt20'
end
end
dependency 'go-license-detector'
dependency 'cacerts'
dependency 'omnibus-gitlab-gems'
......
......@@ -17,7 +17,7 @@
name 'git-filter-repo'
version = Gitlab::Version.new('git-filter-repo', 'v2.45.0')
version = Gitlab::Version.new('git-filter-repo', 'v2.47.0')
default_version version.print(false)
license 'MIT'
......
......@@ -17,4 +17,5 @@
name 'gnupg'
default_version '2.2.41'
dependency 'bzip2'
dependency 'libassuan'
......@@ -20,2 +21,5 @@
dependency 'libassuan'
dependency 'libgcrypt' unless Build::Check.use_system_libgcrypt?
dependency 'libgpg-error'
dependency 'libksba'
dependency 'npth'
......@@ -21,4 +25,2 @@
dependency 'npth'
dependency 'libgcrypt'
dependency 'libksba'
dependency 'zlib'
......@@ -24,5 +26,4 @@
dependency 'zlib'
dependency 'bzip2'
license 'LGPL-2.1'
license_file 'COPYING.LGPL3'
......@@ -39,6 +40,18 @@
# For gnupg to build fine in Debian Wheezy and Centos ^
env['LDFLAGS'] << " -lrt"
config_flags = ""
prefix = "#{install_dir}/embedded"
configure_command = [
'./configure',
"--prefix=#{prefix}",
'--disable-doc',
'--without-readline',
'--disable-sqlite',
'--disable-gnutls',
'--disable-dirmngr',
"--with-libgpg-error-prefix=#{prefix}",
]
# CentOS 6 doesn't have inotify, which will raise an error
# IN_EXCL_UNLINK undeclared. Hence disabling it explicitly.
......@@ -43,4 +56,4 @@
# CentOS 6 doesn't have inotify, which will raise an error
# IN_EXCL_UNLINK undeclared. Hence disabling it explicitly.
config_flags = "ac_cv_func_inotify_init=no" if ohai['platform'] =~ /centos/ && ohai['platform_version'] =~ /^6/
configure_command << "ac_cv_func_inotify_init=no" if ohai['platform'] =~ /centos/ && ohai['platform_version'] =~ /^6/
......@@ -46,7 +59,5 @@
prefix = "#{install_dir}/embedded"
command './configure ' \
"--prefix=#{prefix} --with-libgpg-error-prefix=#{prefix} --disable-doc --without-readline --disable-sqlite --disable-gnutls --disable-dirmngr #{config_flags}", env: env
command configure_command.join(' '), env: env
make "-j #{workers}", env: env
make 'install', env: env
......
......@@ -32,8 +32,15 @@
build do
env = with_standard_compiler_flags(with_embedded_path)
prefix = "#{install_dir}/embedded"
command './configure ' \
"--prefix=#{prefix} --with-libgpg-error-prefix=#{prefix} --disable-doc", env: env
configure_command = [
'./configure',
"--prefix=#{prefix}",
'--disable-doc',
"--with-libgpg-error-prefix=#{prefix}",
]
command configure_command.join(' '), env: env
make "-j #{workers}", env: env
make 'install', env: env
......
......@@ -18,6 +18,6 @@
name 'mattermost'
default_version '10.1.2'
default_version '10.2.0'
source url: "https://releases.mattermost.com/#{version}/mattermost-team-#{version}-linux-amd64.tar.gz",
......@@ -22,6 +22,6 @@
source url: "https://releases.mattermost.com/#{version}/mattermost-team-#{version}-linux-amd64.tar.gz",
sha256: '9532d8009cba69b09de9876a0917833a955270d1d8233623b5fbdb18d98e959a'
sha256: 'c060ad8bc6d437c54b0badeffc752bc986e16759049a4282a8e49b1bae47d0d1'
relative_path 'mattermost'
license_name = 'GITLAB-MATTERMOST-COMPILED-LICENSE.txt'
......
......@@ -24,7 +24,7 @@
# files/gitlab-cookbooks/gitlab/attributes/default.rb
# spec/chef/recipes/gitaly_spec.rb
# spec/chef/recipes/gitlab-rails_spec.rb
default_version '3.9.17'
default_version '3.9.21'
dependency 'libedit'
dependency 'ncurses'
......@@ -44,7 +44,7 @@
skip_transitive_dependency_licensing true
source url: "https://www.python.org/ftp/python/#{version}/Python-#{version}.tgz",
sha256: '8ead58f669f7e19d777c3556b62fae29a81d7f06a7122ff9bc57f7dd82d7e014'
sha256: '667c3ba2ca98d39ead1162f6548c3475768582e2ff89e0821d25eb956ac09944'
relative_path "Python-#{version}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment