Browse Source

fix build with some features disabled

Signed-off-by: Nicola Murino <[email protected]>
Nicola Murino 3 years ago
parent
commit
91e4a54385
7 changed files with 13 additions and 8 deletions
  1. 4 2
      .github/workflows/development.yml
  2. 1 1
      go.mod
  3. 2 1
      go.sum
  4. 0 1
      internal/vfs/azblobfs.go
  5. 0 1
      internal/vfs/gcsfs.go
  6. 0 1
      internal/vfs/s3fs.go
  7. 6 1
      internal/vfs/vfs.go

+ 4 - 2
.github/workflows/development.yml

@@ -222,8 +222,8 @@ jobs:
           name: sftpgo-${{ matrix.os }}-go-${{ matrix.go }}
           path: output
 
-  test-bundle:
-    name: Build in bundle mode
+  test-build-flags:
+    name: Test build flags
     runs-on: ubuntu-latest
 
     steps:
@@ -236,6 +236,8 @@ jobs:
 
       - name: Build
         run: |
+          go build -trimpath -tags nopgxregisterdefaulttypes,nogcs,nos3,noportable,nobolt,nomysql,nopgsql,nosqlite,nometrics,noazblob -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/internal/internal/version.commit=`git describe --always --abbrev=8 --dirty` -X github.com/drakkan/sftpgo/v2/internal/version.date=`date -u +%FT%TZ`" -o sftpgo
+          ./sftpgo -v
           cp -r openapi static templates internal/bundle/
           go build -trimpath -tags nopgxregisterdefaulttypes,bundle -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/internal/version.commit=`git describe --always --abbrev=8 --dirty` -X github.com/drakkan/sftpgo/v2/internal/version.date=`date -u +%FT%TZ`" -o sftpgo
           ./sftpgo -v

+ 1 - 1
go.mod

@@ -97,7 +97,7 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/boombuler/barcode v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect

+ 2 - 1
go.sum

@@ -327,8 +327,9 @@ github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6
 github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw=
 github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M=
 github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E=

+ 0 - 1
internal/vfs/azblobfs.go

@@ -54,7 +54,6 @@ import (
 
 const (
 	azureDefaultEndpoint = "blob.core.windows.net"
-	azBlobFsName         = "AzureBlobFs"
 	azFolderKey          = "hdi_isfolder"
 )
 

+ 0 - 1
internal/vfs/gcsfs.go

@@ -45,7 +45,6 @@ import (
 
 const (
 	defaultGCSPageSize = 5000
-	gcsfsName          = "GCSFs"
 )
 
 var (

+ 0 - 1
internal/vfs/s3fs.go

@@ -57,7 +57,6 @@ const (
 	// using this mime type for directories improves compatibility with s3fs-fuse
 	s3DirMimeType        = "application/x-directory"
 	s3TransferBufferSize = 256 * 1024
-	s3fsName             = "S3Fs"
 )
 
 var (

+ 6 - 1
internal/vfs/vfs.go

@@ -38,7 +38,12 @@ import (
 	"github.com/drakkan/sftpgo/v2/internal/util"
 )
 
-const dirMimeType = "inode/directory"
+const (
+	dirMimeType  = "inode/directory"
+	s3fsName     = "S3Fs"
+	gcsfsName    = "GCSFs"
+	azBlobFsName = "AzureBlobFs"
+)
 
 var (
 	validAzAccessTier = []string{"", "Archive", "Hot", "Cool"}