deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2024-06-26 09:20:14 +02:00
Code Issues Releases Wiki Activity

Merge pull request #754 from strukturag/make-dont-update-dependencies

Browse source 
make: Don't update CLI tools before installing.
This commit is contained in:
Joachim Bauch 2024-06-03 10:01:47 +02:00 committed by GitHub
parent 2f9bdbd919 82919ce97b
commit c46f7b7f9d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/tarball.yml vendored
View file

@ -77,15 +77,12 @@ jobs:
[ -d "tmp/vendor" ] || exit 1
- name: Build
env:
GOPROXY: off
run: |
echo "Building with $(nproc) threads"
make -C tmp build -j$(nproc)
- name: Run tests
env:
GOPROXY: off
USE_DB_IP_GEOIP_DATABASE: "1"
run: |
make -C tmp test TIMEOUT=120s

3
Makefile
View file

@ -70,14 +70,12 @@ hook:
[ ! -d "$(CURDIR)/.git/hooks" ] || ln -sf "$(CURDIR)/scripts/pre-commit.hook" "$(CURDIR)/.git/hooks/pre-commit"
$(GOPATHBIN)/easyjson: go.mod go.sum
[ "$(GOPROXY)" = "off" ] || $(GO) get -d github.com/mailru/easyjson/...
$(GO) install github.com/mailru/easyjson/...
$(GOPATHBIN)/protoc-gen-go: go.mod go.sum
$(GO) install google.golang.org/protobuf/cmd/protoc-gen-go
$(GOPATHBIN)/protoc-gen-go-grpc: go.mod go.sum
[ "$(GOPROXY)" = "off" ] || $(GO) get -d google.golang.org/grpc/cmd/protoc-gen-go-grpc
$(GO) install google.golang.org/grpc/cmd/protoc-gen-go-grpc
continentmap.go:
@ -155,7 +153,6 @@ build: server proxy
vendor: go.mod go.sum common
set -e ;\
rm -rf $(VENDORDIR)
$(GO) mod tidy; \
$(GO) mod vendor
tarball: vendor

3
docker/proxy/Dockerfile
View file

@ -7,8 +7,7 @@ WORKDIR /workdir
COPY . .
RUN touch /.dockerenv && \
apk add --no-cache bash git build-base protobuf && \
if [ -d "vendor" ]; then GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOPROXY=off make proxy; else \
GOOS=${TARGETOS} GOARCH=${TARGETARCH} make proxy; fi
GOOS=${TARGETOS} GOARCH=${TARGETARCH} make proxy
FROM alpine:3

3
docker/server/Dockerfile
View file

@ -7,8 +7,7 @@ WORKDIR /workdir
COPY . .
RUN touch /.dockerenv && \
apk add --no-cache bash git build-base protobuf && \
if [ -d "vendor" ]; then GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOPROXY=off make server; else \
GOOS=${TARGETOS} GOARCH=${TARGETARCH} make server; fi
GOOS=${TARGETOS} GOARCH=${TARGETARCH} make server
FROM alpine:3