From 734a066af8a44b4071a1b06722c04c2cd2a52f24 Mon Sep 17 00:00:00 2001 From: Evan Simkowitz Date: Thu, 18 Jul 2024 15:53:20 -0700 Subject: [PATCH] Fix yaml formatting (#121) --- .vscode/settings.json | 5 +++++ Taskfile.yml | 42 +++++++++++++++++++++--------------------- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 93e7fac1..410b262c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -28,5 +28,10 @@ }, "[json]": { "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[yaml]": { + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.insertSpaces": true, + "editor.autoIndent": "keep", } } diff --git a/Taskfile.yml b/Taskfile.yml index 164dbfea..0335f61e 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -62,30 +62,30 @@ tasks: build:server:darwin: desc: Build the wavesrv component for Darwin platforms (generates artifacts for both arm64 and amd64). status: - - exit {{if eq OS "darwin"}}1{{else}}0{{end}} + - exit {{if eq OS "darwin"}}1{{else}}0{{end}} cmds: - cmd: rm dist/bin/wavesrv* ignore_error: true - task: build:server:internal vars: - GOARCH: arm64 + GOARCH: arm64 - task: build:server:internal vars: - GOARCH: amd64 + GOARCH: amd64 build:server:other: desc: Build the wavesrv component for non-Darwin platforms (only generates artifacts for the current architecture). status: - - exit {{if eq OS "darwin"}}0{{else}}1{{end}} + - exit {{if eq OS "darwin"}}0{{else}}1{{end}} cmds: - cmd: rm dist/bin/wavesrv* ignore_error: true - task: build:server:internal vars: - GOARCH: - sh: echo {{if eq "arm" ARCH}}arm64{{else}}{{ARCH}}{{end}} - GO_LDFLAGS: -linkmode 'external' -extldflags=-static - + GOARCH: + sh: echo {{if eq "arm" ARCH}}arm64{{else}}{{ARCH}}{{end}} + GO_LDFLAGS: -linkmode 'external' -extldflags=-static + build:server:internal: requires: vars: @@ -108,32 +108,32 @@ tasks: ignore_error: true - task: build:wsh:internal vars: - GOOS: darwin - GOARCH: arm64 + GOOS: darwin + GOARCH: arm64 - task: build:wsh:internal vars: - GOOS: darwin - GOARCH: amd64 + GOOS: darwin + GOARCH: amd64 - task: build:wsh:internal vars: - GOOS: linux - GOARCH: arm64 + GOOS: linux + GOARCH: arm64 - task: build:wsh:internal vars: - GOOS: linux - GOARCH: amd64 + GOOS: linux + GOARCH: amd64 - task: build:wsh:internal vars: - GOOS: windows - GOARCH: amd64 + GOOS: windows + GOARCH: amd64 - task: build:wsh:internal vars: - GOOS: windows - GOARCH: arm64 + GOOS: windows + GOARCH: arm64 build:wsh:internal: vars: - EXT: + EXT: sh: echo {{if eq .GOOS "windows"}}.exe{{end}} requires: vars: