realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update gitaly dependencies and vendor symlinks

Browse source
This commit is contained in:
Pirate Praveen 2023-07-09 10:04:07 +05:30
parent b0e9689d1b
commit 3921773f8e
No known key found for this signature in database
GPG key ID: 8F53E0193B294B75
2 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debian/control vendored
View file

@ -47,7 +47,7 @@ Build-Depends: debhelper-compat (= 13),
golang-github-sebest-xff-dev, golang-github-sebest-xff-dev,
golang-github-sirupsen-logrus-dev, golang-github-sirupsen-logrus-dev,
golang-github-stretchr-testify-dev (>= 1.4~), golang-github-stretchr-testify-dev (>= 1.4~),
golang-gitlab-gitlab-org-gitaly-dev (>= 15.11~), golang-gitlab-gitlab-org-gitaly-dev (>= 16~),
golang-github-beevik-ntp-dev, golang-github-beevik-ntp-dev,
# protobuf-1-5 # protobuf-1-5
# golang-gitlab-gitlab-org-labkit-dev (>= 1.14~), # golang-gitlab-gitlab-org-labkit-dev (>= 1.14~),
@ -545,7 +545,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
# gitlab-sidekiq was failing without puma # gitlab-sidekiq was failing without puma
puma puma
Recommends: certbot, Recommends: certbot,
gitaly (>= 15.11~), gitaly (>= 16~),
openssh-server openssh-server
Conflicts: libruby2.5 Conflicts: libruby2.5
Description: git powered software platform to collaborate on code (non-omnibus) Description: git powered software platform to collaborate on code (non-omnibus)

35
debian/rules vendored
View file

@ -22,29 +22,30 @@ override_dh_auto_configure-arch:
# Remove non-existent symlink # Remove non-existent symlink
find ${BUILDDIR} -name test.git -delete find ${BUILDDIR} -name test.git -delete
# temporary step till protobuf 1.5 vs 1.3 is resolved # temporary step till protobuf 1.5 vs 1.3 is resolved
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/github.com/prometheus ${BUILDDIR}/vendor/github.com ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v16/vendor/github.com/prometheus ${BUILDDIR}/vendor/github.com
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/github.com/matttproud ${BUILDDIR}/vendor/github.com ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v16/vendor/github.com/matttproud ${BUILDDIR}/vendor/github.com
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/github.com/googleapis/gax-go ${BUILDDIR}/vendor/github.com/googleapis ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v16/vendor/github.com/googleapis/gax-go ${BUILDDIR}/vendor/github.com/googleapis
mkdir -p ${BUILDDIR}/vendor/google.golang.org mkdir -p ${BUILDDIR}/vendor/google.golang.org
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/google.golang.org/api ${BUILDDIR}/vendor/google.golang.org ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v16/vendor/google.golang.org/api ${BUILDDIR}/vendor/google.golang.org
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/google.golang.org/genproto ${BUILDDIR}/vendor/google.golang.org ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v16/vendor/google.golang.org/genproto ${BUILDDIR}/vendor/google.golang.org
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/go.opencensus.io ${BUILDDIR}/vendor ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v16/vendor/go.opencensus.io ${BUILDDIR}/vendor
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/gitlab.com/gitlab-org/labkit ${BUILDDIR}/vendor/gitlab.com/gitlab-org ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v16/vendor/gitlab.com/gitlab-org/labkit ${BUILDDIR}/vendor/gitlab.com/gitlab-org
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/github.com/golang/groupcache ${BUILDDIR}/vendor/github.com/golang ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v16/vendor/github.com/golang/groupcache ${BUILDDIR}/vendor/github.com/golang
mkdir -p ${BUILDDIR}/vendor/github.com/cespare/xxhash mkdir -p ${BUILDDIR}/vendor/github.com/cespare/xxhash
ln -s /usr/share/gocode/src/github.com/cespare/xxhash ${BUILDDIR}/vendor/github.com/cespare/xxhash/v2 ln -s /usr/share/gocode/src/github.com/cespare/xxhash ${BUILDDIR}/vendor/github.com/cespare/xxhash/v2
mkdir -p ${BUILDDIR}/vendor/github.com/oklog/ulid mkdir -p ${BUILDDIR}/vendor/github.com/oklog/ulid
ln -s /usr/share/gocode/src/github.com/oklog/ulid ${BUILDDIR}/vendor/github.com/oklog/ulid/v2 ln -s /usr/share/gocode/src/github.com/oklog/ulid ${BUILDDIR}/vendor/github.com/oklog/ulid/v2
mkdir -p ${BUILDDIR}/vendor/cloud.google.com mkdir -p ${BUILDDIR}/vendor/cloud.google.com
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/cloud.google.com/go ${BUILDDIR}/vendor/cloud.google.com ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v16/vendor/cloud.google.com/go ${BUILDDIR}/vendor/cloud.google.com
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/gocloud.dev ${BUILDDIR}/vendor ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v16/vendor/gocloud.dev ${BUILDDIR}/vendor
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/github.com/aws ${BUILDDIR}/vendor/github.com ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v16/vendor/github.com/aws ${BUILDDIR}/vendor/github.com
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/github.com/Azure ${BUILDDIR}/vendor/github.com ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v16/vendor/github.com/Azure ${BUILDDIR}/vendor/github.com
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/github.com/AzureAD ${BUILDDIR}/vendor/github.com ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v16/vendor/github.com/AzureAD ${BUILDDIR}/vendor/github.com
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/github.com/uber ${BUILDDIR}/vendor/github.com ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v16/vendor/github.com/uber ${BUILDDIR}/vendor/github.com
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/github.com/lightstep ${BUILDDIR}/vendor/github.com ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v16/vendor/github.com/lightstep ${BUILDDIR}/vendor/github.com
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/github.com/shirou ${BUILDDIR}/vendor/github.com ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v16/vendor/github.com/shirou ${BUILDDIR}/vendor/github.com
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/github.com/tklauser ${BUILDDIR}/vendor/github.com ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v16/vendor/github.com/tklauser ${BUILDDIR}/vendor/github.com
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v16/vendor/github.com/golang-jwt ${BUILDDIR}/vendor/github.com
override_dh_auto_build-indep: override_dh_auto_build-indep:
dh_auto_build -O--package=gitlab -O--buildsystem=ruby -O--with=ruby dh_auto_build -O--package=gitlab -O--buildsystem=ruby -O--with=ruby