diff options
| -rw-r--r-- | .gitlab/merge_request_templates/Default.md | 4 | ||||
| -rw-r--r-- | .ruby-version | 1 | ||||
| -rw-r--r-- | .tool-versions | 1 | ||||
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | Gemfile | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 101 | ||||
| -rw-r--r-- | Makefile.build.mk | 9 |
7 files changed, 14 insertions, 113 deletions
diff --git a/.gitlab/merge_request_templates/Default.md b/.gitlab/merge_request_templates/Default.md index 73899f9c..e42e7081 100644 --- a/.gitlab/merge_request_templates/Default.md +++ b/.gitlab/merge_request_templates/Default.md @@ -2,6 +2,8 @@ <!-- Describe your changes here --> +%{first_multiline_commit} + ## TODO - [Feature flag](https://docs.gitlab.com/ee/development/pages/#feature-flags) @@ -15,4 +17,4 @@ - [ ] I followed [Go Style guidelines](https://docs.gitlab.com/ee/development/go_guide/) <!-- Labels - do not remove --> -/label ~"Category:Pages" ~"devops::create" ~"group::editor" +/label ~"section::dev" ~"devops::plan" ~"group::knowledge" ~"Category:Pages" diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index eca690e7..00000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -3.0.5 diff --git a/.tool-versions b/.tool-versions index f434cb94..32603da9 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1 @@ golang 1.19.9 -ruby 3.0.5 diff --git a/CHANGELOG.md b/CHANGELOG.md index b99d105e..4bdb11d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 15.11.4 (2023-05-16) + +No changes. + ## 15.11.3 (2023-05-10) No changes. diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 031d084d..00000000 --- a/Gemfile +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -source 'https://rubygems.org' - -group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.1', require: false -end diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index c83a2504..00000000 --- a/Gemfile.lock +++ /dev/null @@ -1,101 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - claide (1.1.0) - claide-plugins (0.9.2) - cork - nap - open4 (~> 1.3) - colored2 (3.1.2) - cork (0.3.0) - colored2 (~> 3.1) - danger (8.6.1) - claide (~> 1.0) - claide-plugins (>= 0.9.2) - colored2 (~> 3.1) - cork (~> 0.1) - faraday (>= 0.9.0, < 2.0) - faraday-http-cache (~> 2.0) - git (~> 1.7) - kramdown (~> 2.3) - kramdown-parser-gfm (~> 1.0) - no_proxy_fix - octokit (~> 4.7) - terminal-table (>= 1, < 4) - danger-gitlab (8.0.0) - danger - gitlab (~> 4.2, >= 4.2.0) - faraday (1.10.0) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-http-cache (2.2.0) - faraday (>= 0.8) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.3) - multipart-post (>= 1.2, < 3) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - git (1.11.0) - rchardet (~> 1.8) - gitlab (4.18.0) - httparty (~> 0.18) - terminal-table (>= 1.5.1) - gitlab-dangerfiles (3.1.0) - danger (>= 8.4.5) - danger-gitlab (>= 8.0.0) - rake - httparty (0.20.0) - mime-types (~> 3.0) - multi_xml (>= 0.5.2) - kramdown (2.4.0) - rexml - kramdown-parser-gfm (1.1.0) - kramdown (~> 2.0) - mime-types (3.4.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) - multi_xml (0.6.0) - multipart-post (2.1.1) - nap (1.1.0) - no_proxy_fix (0.1.2) - octokit (4.22.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) - open4 (1.3.4) - public_suffix (4.0.7) - rake (13.0.6) - rchardet (1.8.0) - rexml (3.2.5) - ruby2_keywords (0.0.5) - sawyer (0.8.2) - addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) - terminal-table (3.0.2) - unicode-display_width (>= 1.1.1, < 3) - unicode-display_width (2.1.0) - -PLATFORMS - ruby - -DEPENDENCIES - gitlab-dangerfiles (~> 3.1) - -BUNDLED WITH - 2.3.13 diff --git a/Makefile.build.mk b/Makefile.build.mk index c147e16f..cc7ab181 100644 --- a/Makefile.build.mk +++ b/Makefile.build.mk @@ -3,6 +3,11 @@ GO_BUILD_TAGS := continuous_profiler_stackdriver MOCKGEN_VERSION=v1.6.0 FIPS_MODE ?= 0 ifeq ($(FIPS_MODE), 1) + BORINGCRYPTO_SUPPORT := $(shell GOEXPERIMENT=boringcrypto go version > /dev/null 2>&1; echo $$?) + ifeq ($(BORINGCRYPTO_SUPPORT), 0) + GO_BUILD_ENV=GOEXPERIMENT=boringcrypto + endif + GO_BUILD_TAGS := $(GO_BUILD_TAGS),fips endif @@ -23,11 +28,11 @@ generate-mocks: $Q go run github.com/golang/mock/mockgen@$(MOCKGEN_VERSION) -source=internal/domain/resolver.go -destination=internal/domain/mock/resolver_mock.go -package=mock build: - $Q GOBIN=$(BINDIR) go install $(if $V,-v) -ldflags="$(VERSION_FLAGS)" -tags "${GO_BUILD_TAGS}" -buildmode exe $(IMPORT_PATH) + $Q GOBIN=$(BINDIR) $(GO_BUILD_ENV) go install $(if $V,-v) -ldflags="$(VERSION_FLAGS)" -tags "${GO_BUILD_TAGS}" -buildmode exe $(IMPORT_PATH) ifndef WITHOUT_BUILD_ID GO_BUILD_ID=$$( go tool buildid $(BINDIR)/gitlab-pages ) && \ GNU_BUILD_ID=$$( echo $$GO_BUILD_ID | sha1sum | cut -d' ' -f1 ) && \ - $Q GOBIN=$(BINDIR) go install $(if $V,-v) -ldflags="$(VERSION_FLAGS) -B 0x$$GNU_BUILD_ID" -tags "${GO_BUILD_TAGS}" -buildmode exe $(IMPORT_PATH) + $Q GOBIN=$(BINDIR) $(GO_BUILD_ENV) go install $(if $V,-v) -ldflags="$(VERSION_FLAGS) -B 0x$$GNU_BUILD_ID" -tags "${GO_BUILD_TAGS}" -buildmode exe $(IMPORT_PATH) endif ifeq ($(FIPS_MODE), 1) go tool nm $(BINDIR)/gitlab-pages | grep boringcrypto >/dev/null && echo "binary is correctly built in FIPS mode" || (echo "binary is not correctly built in FIPS mode" && exit 1) |