diff options
author | Toon Claes <toon@gitlab.com> | 2023-04-26 15:39:42 +0300 |
---|---|---|
committer | Toon Claes <toon@gitlab.com> | 2023-04-26 15:39:42 +0300 |
commit | 2135a63c3742d0ddbf0164e7071e1d1af52e166d (patch) | |
tree | 2f9a43e3dc3b290fc2e363b8b1344a353b34b2fb | |
parent | 20bc01b4d81c0e101a3a6639a926a6b9d0d7d9ba (diff) | |
parent | 4200754b3dc5c23a8c3498d659276c664e49635c (diff) |
Merge branch 'pks-ruby-nuke-more-leftovers' into 'master'
Remove various Ruby leftovers
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5671
Merged-by: Toon Claes <toon@gitlab.com>
Approved-by: Toon Claes <toon@gitlab.com>
Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>
-rw-r--r-- | .codeclimate.yml | 3 | ||||
-rw-r--r-- | .gitlab-ci.yml | 14 | ||||
-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | README.md | 7 |
4 files changed, 4 insertions, 23 deletions
diff --git a/.codeclimate.yml b/.codeclimate.yml index bb06b8b33..ce232356a 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -11,8 +11,5 @@ engines: ratings: paths: - "**.go" - - "**.rb" exclude_paths: -- vendor/ - _build/ -- ruby/vendor/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4113fded..31846ad07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,6 @@ variables: # We use Gitaly's Git version by default. GIT_VERSION: "default" GO_VERSION: "1.19" - RUBY_VERSION: "3.0" RUST_VERSION: "1.65" POSTGRES_VERSION: "12-alpine" PGBOUNCER_VERSION: "1.17.0" @@ -368,7 +367,6 @@ verify: artifacts: paths: - _build/proto.diff - - ruby/proto/gitaly/* - proto/go/gitalypb/* when: on_failure @@ -413,17 +411,7 @@ license_scanning: - if: $CI_MERGE_REQUEST_IID - if: $CI_COMMIT_TAG variables: - LICENSE_FINDER_CLI_OPTS: '--aggregate-paths=. ruby' - -gemnasium-dependency_scanning: - needs: [] - stage: analyze - rules: - - if: $DEPENDENCY_SCANNING_DISABLED - when: never - - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - - if: $CI_MERGE_REQUEST_IID - - if: $CI_COMMIT_TAG + LICENSE_FINDER_CLI_OPTS: '--aggregate-paths=.' secret_detection: needs: [] @@ -29,7 +29,6 @@ BUILD_DIR := ${SOURCE_DIR}/_build PROTO_DEST_DIR := ${SOURCE_DIR}/proto/go DEPENDENCY_DIR := ${BUILD_DIR}/deps TOOLS_DIR := ${BUILD_DIR}/tools -GITALY_RUBY_DIR := ${SOURCE_DIR}/ruby # These variables may be overridden at runtime by top-level make ## The prefix where Gitaly binaries will be installed to. Binaries will end up @@ -245,7 +244,7 @@ GITALY_PACKED_EXECUTABLES = $(filter %gitaly-hooks %gitaly-git2go %gitaly-ssh # All executables that should be installed. GITALY_INSTALLED_EXECUTABLES = $(filter-out ${GITALY_PACKED_EXECUTABLES}, ${GITALY_EXECUTABLES}) # Find all Go source files. -find_go_sources = $(shell find ${SOURCE_DIR} -type d \( -path "${SOURCE_DIR}/_*" -o -path "${SOURCE_DIR}/ruby" -o -path "${SOURCE_DIR}/proto" \) -prune -o -type f -name '*.go' -print | sort -u) +find_go_sources = $(shell find ${SOURCE_DIR} -type d \( -path "${SOURCE_DIR}/_*" -o -path "${SOURCE_DIR}/proto" \) -prune -o -type f -name '*.go' -print | sort -u) # run_go_tests will execute Go tests with all required parameters. Its # behaviour can be modified via the following variables: @@ -55,8 +55,8 @@ GitLab.com, read about our [observability story](doc/observability.md)! Most users won't install Gitaly on its own. It is already included in [your GitLab installation](https://about.gitlab.com/install/). -Gitaly requires Go 1.18 or Go 1.19 and Ruby 2.7. Run `make` to download and -compile Ruby dependencies, and to compile the Gitaly Go executable. +Gitaly requires Go 1.18 or Go 1.19.7. Run `make` to compile the executables +required by Gitaly. Gitaly uses `git`. Versions `2.38.0` and newer are supported. @@ -98,9 +98,6 @@ As of Q4 2018, the following GitLab components act as Gitaly clients: ([example](https://gitlab.com/gitlab-org/gitaly/raw/master/README.md)) - [`gitaly-ssh`](https://gitlab.com/gitlab-org/gitaly/tree/master/cmd/gitaly-ssh): for internal Git data transfers between Gitaly servers. -- [`gitaly-ruby`](https://gitlab.com/gitlab-org/gitaly/blob/master/ruby/lib/gitlab/git/gitaly_remote_repository.rb): - for RPC's that interact with more than one repository, such as - merging a branch. The clients written in Go (`gitlab-shell`, `gitlab-workhorse`, `gitaly-ssh`) use library code from the |