Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions commands/actions/publish.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ var (
projectSlug string
actions *actionsModel.ProjectActions
outDir string
sourcesDir string
sources map[string]string
logicExist bool
dependenciesExist bool
Expand Down Expand Up @@ -141,6 +142,7 @@ func buildFunc(cmd *cobra.Command, args []string) {
}

outDir = actions.Sources
sourcesDir = actions.Sources

exists := util.PackageJSONExists(actions.Sources)
if exists {
Expand All @@ -165,13 +167,16 @@ func buildFunc(cmd *cobra.Command, args []string) {
}

if tsconfig != nil {
outDir = filepath.Join(outDir, *tsconfig.CompilerOptions.OutDir)
outDir = filepath.Join(actions.Sources, *tsconfig.CompilerOptions.OutDir)
if *tsconfig.CompilerOptions.RootDir != "" {
sourcesDir = filepath.Join(actions.Sources, *tsconfig.CompilerOptions.RootDir)
}
mustInstallDependencies(actions.Sources)
mustBuildProject(actions.Sources, tsconfig)
mustExistCompiledFiles(outDir, actions)
}

sources = mustValidateAndGetSources(r, actions, projectSlug, actions.Sources)
sources = mustValidateAndGetSources(r, actions, projectSlug, sourcesDir)
logrus.Info(commands.Colorizer.Green("\nBuild completed."))
}

Expand Down
6 changes: 3 additions & 3 deletions commands/logout.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ var logoutCmd = &cobra.Command{
}

if config.GetAccessKeyId() != "" {
// If logged in via token, don't revoke provided token.
rest := NewRest()
emailLogout(rest)
// If logged in via token, don't revoke provided token.
rest := NewRest()
emailLogout(rest)
}

config.SetGlobalConfig(config.Token, "")
Expand Down
24 changes: 0 additions & 24 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ require (
github.com/ghodss/yaml v1.0.0
github.com/go-git/go-git/v5 v5.4.2
github.com/google/go-github/v37 v37.0.0
github.com/gorilla/websocket v1.4.2
github.com/hashicorp/go-version v1.2.0
github.com/logrusorgru/aurora v0.0.0-20190803045625-94edacc10f9b
github.com/manifoldco/promptui v0.3.0
Expand All @@ -29,32 +28,17 @@ require (
require (
github.com/Microsoft/go-winio v0.4.16 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
github.com/VictoriaMetrics/fastcache v1.6.0 // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
github.com/allegro/bigcache v1.2.1 // indirect
github.com/btcsuite/btcd v0.22.0-beta // indirect
github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/deckarep/golang-set v1.8.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
github.com/emirpasic/gods v1.12.0 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/go-git/go-billy/v5 v5.3.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-querystring v1.0.0 // indirect
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
github.com/holiman/uint256 v1.2.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
Expand All @@ -65,33 +49,25 @@ require (
github.com/magiconair/properties v1.8.5 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/palantir/pkg v1.0.1 // indirect
github.com/palantir/pkg/transform v1.0.0 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/tsdb v0.7.1 // indirect
github.com/robertkrimen/otto v0.0.0-20211024170158-b87d35c0b86f // indirect
github.com/sergi/go-diff v1.1.0 // indirect
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
github.com/tklauser/go-sysconf v0.3.5 // indirect
github.com/tklauser/numcpus v0.2.2 // indirect
github.com/xanzy/ssh-agent v0.3.0 // indirect
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
golang.org/x/net v0.4.0 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
gopkg.in/ini.v1 v1.66.2 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
Loading