Skip to content

Commit

Permalink
Remove vendored dependencies (stashapp#4110)
Browse files Browse the repository at this point in the history
  • Loading branch information
its-josh4 authored Sep 12, 2023
1 parent b36aa74 commit 4a9fdc8
Show file tree
Hide file tree
Showing 2,675 changed files with 20 additions and 1,259,580 deletions.
23 changes: 15 additions & 8 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
run: docker exec -t build /bin/bash -c "make generate-backend"

- name: Run golangci-lint
uses: golangci/golangci-lint-action@v2
uses: golangci/golangci-lint-action@v3
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: latest
Expand All @@ -42,19 +42,26 @@ jobs:
# working-directory: somedir

# Optional: golangci-lint command line arguments.
args: --modules-download-mode=vendor --timeout=5m
#
# Note: By default, the `.golangci.yml` file should be at the root of the repository.
# The location of the configuration file can be changed by using `--config=`
args: --timeout=5m

# Optional: show only new issues if it's a pull request. The default value is `false`.
# only-new-issues: true

# Optional: if set to true then the action will use pre-installed Go.
# skip-go-installation: true
# Optional: if set to true, then all caching functionality will be completely disabled,
# takes precedence over all other caching options.
# skip-cache: true

# Optional: if set to true then the action don't cache or restore ~/go/pkg.
skip-pkg-cache: true
# Optional: if set to true, then the action won't cache or restore ~/go/pkg.
# skip-pkg-cache: true

# Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
skip-build-cache: true
# Optional: if set to true, then the action won't cache or restore ~/.cache/go-build.
# skip-build-cache: true

# Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
# install-mode: "goinstall"

- name: Cleanup build container
run: docker rm -f -v build
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
# Go
####

# Vendored dependencies
vendor

# Binaries for programs and plugins
*.exe
*.exe~
Expand Down
1 change: 0 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# options for analysis running
run:
timeout: 5m
modules-download-mode: vendor

linters:
disable-all: true
Expand Down
2 changes: 1 addition & 1 deletion cmd/stash/main.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:generate go run -mod=vendor github.com/99designs/gqlgen
//go:generate go run github.com/99designs/gqlgen
package main

import (
Expand Down
1 change: 0 additions & 1 deletion docker/build/x86_64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ RUN apk add --no-cache make alpine-sdk
WORKDIR /stash
COPY ./go* ./*.go Makefile gqlgen.yml .gqlgenc.yml /stash/
COPY ./scripts /stash/scripts/
COPY ./vendor /stash/vendor/
COPY ./pkg /stash/pkg/
COPY ./cmd /stash/cmd
COPY ./internal /stash/internal
Expand Down
1 change: 0 additions & 1 deletion docker/build/x86_64/Dockerfile-CUDA
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ RUN apt update && apt install -y build-essential golang
WORKDIR /stash
COPY ./go* ./*.go Makefile gqlgen.yml .gqlgenc.yml /stash/
COPY ./scripts /stash/scripts/
COPY ./vendor /stash/vendor/
COPY ./pkg /stash/pkg/
COPY ./cmd /stash/cmd
COPY ./internal /stash/internal
Expand Down
2 changes: 1 addition & 1 deletion scripts/cross-compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

COMPILER_CONTAINER="stashapp/compiler:7"

BUILD_DATE=`go run -mod=vendor scripts/getDate.go`
BUILD_DATE=`go run scripts/getDate.go`
GITHASH=`git rev-parse --short HEAD`
STASH_VERSION=`git describe --tags --exclude latest_develop`

Expand Down
3 changes: 0 additions & 3 deletions vendor/github.com/99designs/gqlgen/.dockerignore

This file was deleted.

20 changes: 0 additions & 20 deletions vendor/github.com/99designs/gqlgen/.editorconfig

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/99designs/gqlgen/.gitattributes

This file was deleted.

16 changes: 0 additions & 16 deletions vendor/github.com/99designs/gqlgen/.gitignore

This file was deleted.

39 changes: 0 additions & 39 deletions vendor/github.com/99designs/gqlgen/.golangci.yml

This file was deleted.

Loading

0 comments on commit 4a9fdc8

Please sign in to comment.