Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Aug 30, 2024. It is now read-only.
/coder-v1-cliPublic archive

chore: cleanup ci scripts#228

Merged
cmoog merged 7 commits intomasterfromci-cleanup
Jan 25, 2021
Merged
Show file tree
Hide file tree
Changes fromall 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
2 changes: 1 addition & 1 deletion.github/workflows/integration.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,4 +23,4 @@ jobs:
with:
go-version: '^1.14'
- name: integration tests
run: ./ci/steps/integration.sh
run: ./ci/scripts/integration.sh
8 changes: 5 additions & 3 deletions.github/workflows/test.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@ jobs:
- name: fmt
uses: ./ci/image
with:
args: ./ci/steps/fmt.sh
args: make -j fmt
- run: ./ci/scripts/files_changed.sh
lint:
runs-on: ubuntu-latest
steps:
Expand All@@ -38,7 +39,7 @@ jobs:
- name: test
uses: ./ci/image
with:
args:./ci/steps/unit_test.sh
args:make -j test/go
gendocs:
runs-on: ubuntu-latest
steps:
Expand All@@ -52,4 +53,5 @@ jobs:
- name: generate-docs
uses: ./ci/image
with:
args: ./ci/steps/gendocs.sh
args: make -j gendocs
- run: ./ci/scripts/files_changed.sh
27 changes: 23 additions & 4 deletionsMakefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
# Makefile for Coder CLI

.PHONY: clean build build/macos build/windows build/linux
.PHONY: clean build build/macos build/windows build/linux fmt lint gendocs test/go

PROJECT_ROOT := $(shell git rev-parse --show-toplevel)
MAKE_ROOT := $(shell pwd)

clean:
rm -rf ./ci/bin
Expand All@@ -9,8 +12,24 @@ build: build/macos build/windows build/linux

build/macos:
# requires darwin
CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 ./ci/steps/build.sh
CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 ./ci/scripts/build.sh
build/windows:
CGO_ENABLED=0 GOOS=windows GOARCH=386 ./ci/steps/build.sh
CGO_ENABLED=0 GOOS=windows GOARCH=386 ./ci/scripts/build.sh
build/linux:
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 ./ci/steps/build.sh
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 ./ci/scripts/build.sh

fmt:
go mod tidy
gofmt -w -s .
goimports -w "-local=$$(go list -m)" .

lint:
golangci-lint run -c .golangci.yml

gendocs:
rm -rf ./docs
mkdir ./docs
go run ./cmd/coder gen-docs ./docs

test/go:
go test $$(go list ./... | grep -v pkg/tcli | grep -v ci/integration | grep -v coder-sdk)
5 changes: 3 additions & 2 deletionsci/integration/envs_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,12 +10,13 @@ import (
"testing"
"time"

"cdr.dev/coder-cli/coder-sdk"
"cdr.dev/coder-cli/pkg/tcli"
"cdr.dev/slog"
"cdr.dev/slog/sloggers/slogtest"
"cdr.dev/slog/sloggers/slogtest/assert"
"github.com/google/go-cmp/cmp"

"cdr.dev/coder-cli/coder-sdk"
"cdr.dev/coder-cli/pkg/tcli"
)

func cleanupClient(ctx context.Context, t *testing.T) *coder.Client {
Expand Down
3 changes: 2 additions & 1 deletionci/integration/integration_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,9 @@ import (
"testing"
"time"

"cdr.dev/coder-cli/pkg/tcli"
"cdr.dev/slog/sloggers/slogtest/assert"

"cdr.dev/coder-cli/pkg/tcli"
)

func run(t *testing.T, container string, execute func(t *testing.T, ctx context.Context, runner *tcli.ContainerRunner)) {
Expand Down
3 changes: 2 additions & 1 deletionci/integration/setup_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,9 @@ import (
"strings"
"testing"

"cdr.dev/coder-cli/pkg/tcli"
"golang.org/x/xerrors"

"cdr.dev/coder-cli/pkg/tcli"
)

// binpath is populated during package initialization with a path to the coder binary.
Expand Down
3 changes: 2 additions & 1 deletionci/integration/tags_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,10 @@ import (
"context"
"testing"

"cdr.dev/slog/sloggers/slogtest/assert"

"cdr.dev/coder-cli/coder-sdk"
"cdr.dev/coder-cli/pkg/tcli"
"cdr.dev/slog/sloggers/slogtest/assert"
)

func TestTags(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletionci/integration/users_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,10 @@ import (
"context"
"testing"

"cdr.dev/slog/sloggers/slogtest/assert"

"cdr.dev/coder-cli/coder-sdk"
"cdr.dev/coder-cli/pkg/tcli"
"cdr.dev/slog/sloggers/slogtest/assert"
)

func TestUsers(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletionci/steps/build.sh → ci/scripts/build.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ popd() { builtin popd >/dev/null; }

set -euo pipefail

cd "$(git rev-parse --show-toplevel)/ci/steps"
cd "$(git rev-parse --show-toplevel)/ci/scripts"

tag=$(git describe --tags)

Expand Down
11 changes: 11 additions & 0 deletionsci/scripts/files_changed.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
#!/bin/bash

set -euo pipefail

cd "$(git rev-parse --show-toplevel)"

if [[ $(git ls-files --other --modified --exclude-standard) ]]; then
echo "Files have changed:"
git -c color.ui=never status
exit 1
fi
File renamed without changes.
18 changes: 0 additions & 18 deletionsci/steps/fmt.sh
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletionsci/steps/gendocs.sh
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletionsci/steps/lint.sh
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletionsci/steps/unit_test.sh
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletioncoder-sdk/config_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@ import (
"testing"
"time"

"cdr.dev/coder-cli/coder-sdk"
"cdr.dev/slog"
"cdr.dev/slog/sloggers/slogtest"
"cdr.dev/slog/sloggers/slogtest/assert"

"cdr.dev/coder-cli/coder-sdk"
)

func newClient(t *testing.T) *coder.Client {
Expand Down
3 changes: 2 additions & 1 deletioninternal/cmd/ceapi.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,10 @@ import (
"fmt"
"strings"

"golang.org/x/xerrors"

"cdr.dev/coder-cli/coder-sdk"
"cdr.dev/coder-cli/pkg/clog"
"golang.org/x/xerrors"
)

// Helpers for working with the Coder Enterprise API.
Expand Down
3 changes: 2 additions & 1 deletioninternal/cmd/cmd.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,10 @@ package cmd
import (
"os"

"cdr.dev/coder-cli/internal/x/xcobra"
"github.com/spf13/cobra"
"github.com/spf13/cobra/doc"

"cdr.dev/coder-cli/internal/x/xcobra"
)

// verbose is a global flag for specifying that a command should give verbose output.
Expand Down
5 changes: 3 additions & 2 deletionsinternal/cmd/configssh.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,12 @@ import (

"cdr.dev/coder-cli/pkg/clog"

"github.com/spf13/cobra"
"golang.org/x/xerrors"

"cdr.dev/coder-cli/coder-sdk"
"cdr.dev/coder-cli/internal/coderutil"
"cdr.dev/coder-cli/internal/config"
"github.com/spf13/cobra"
"golang.org/x/xerrors"
)

const sshStartToken = "# ------------START-CODER-ENTERPRISE-----------"
Expand Down
5 changes: 3 additions & 2 deletionsinternal/cmd/images.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,12 @@ import (
"encoding/json"
"os"

"github.com/spf13/cobra"
"golang.org/x/xerrors"

"cdr.dev/coder-cli/coder-sdk"
"cdr.dev/coder-cli/pkg/clog"
"cdr.dev/coder-cli/pkg/tablewriter"
"github.com/spf13/cobra"
"golang.org/x/xerrors"
)

func imgsCmd() *cobra.Command {
Expand Down
9 changes: 5 additions & 4 deletionsinternal/cmd/login.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,16 +8,17 @@ import (
"net/url"
"strings"

"github.com/pkg/browser"
"github.com/spf13/cobra"
"golang.org/x/sync/errgroup"
"golang.org/x/xerrors"

"cdr.dev/coder-cli/coder-sdk"
"cdr.dev/coder-cli/internal/config"
"cdr.dev/coder-cli/internal/loginsrv"
"cdr.dev/coder-cli/internal/version"
"cdr.dev/coder-cli/internal/x/xcobra"
"cdr.dev/coder-cli/pkg/clog"
"github.com/pkg/browser"
"github.com/spf13/cobra"
"golang.org/x/sync/errgroup"
"golang.org/x/xerrors"
)

func loginCmd() *cobra.Command {
Expand Down
5 changes: 3 additions & 2 deletionsinternal/cmd/logout.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,11 @@ package cmd
import (
"os"

"cdr.dev/coder-cli/internal/config"
"cdr.dev/coder-cli/pkg/clog"
"github.com/spf13/cobra"
"golang.org/x/xerrors"

"cdr.dev/coder-cli/internal/config"
"cdr.dev/coder-cli/pkg/clog"
)

func logoutCmd() *cobra.Command {
Expand Down
7 changes: 4 additions & 3 deletionsinternal/cmd/rebuild.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,15 +7,16 @@ import (
"strings"
"time"

"cdr.dev/coder-cli/coder-sdk"
"cdr.dev/coder-cli/internal/x/xcobra"
"cdr.dev/coder-cli/pkg/clog"
"github.com/briandowns/spinner"
"github.com/fatih/color"
"github.com/manifoldco/promptui"
"github.com/spf13/cobra"
"golang.org/x/crypto/ssh/terminal"
"golang.org/x/xerrors"

"cdr.dev/coder-cli/coder-sdk"
"cdr.dev/coder-cli/internal/x/xcobra"
"cdr.dev/coder-cli/pkg/clog"
)

func rebuildEnvCommand() *cobra.Command {
Expand Down
5 changes: 3 additions & 2 deletionsinternal/cmd/resourcemanager.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@ import (
"sort"
"text/tabwriter"

"cdr.dev/coder-cli/coder-sdk"
"cdr.dev/coder-cli/pkg/clog"
"github.com/spf13/cobra"
"golang.org/x/xerrors"

"cdr.dev/coder-cli/coder-sdk"
"cdr.dev/coder-cli/pkg/clog"
)

func resourceCmd() *cobra.Command {
Expand Down
3 changes: 2 additions & 1 deletioninternal/cmd/shell.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,12 +15,13 @@ import (
"golang.org/x/xerrors"
"nhooyr.io/websocket"

"cdr.dev/wsep"

"cdr.dev/coder-cli/coder-sdk"
"cdr.dev/coder-cli/internal/activity"
"cdr.dev/coder-cli/internal/coderutil"
"cdr.dev/coder-cli/internal/x/xterminal"
"cdr.dev/coder-cli/pkg/clog"
"cdr.dev/wsep"
)

func getEnvsForCompletion(user string) func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
Expand Down
5 changes: 3 additions & 2 deletionsinternal/cmd/sync.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,12 +8,13 @@ import (
"path/filepath"
"strings"

"github.com/spf13/cobra"
"golang.org/x/xerrors"

"cdr.dev/coder-cli/coder-sdk"
"cdr.dev/coder-cli/internal/sync"
"cdr.dev/coder-cli/internal/x/xcobra"
"cdr.dev/coder-cli/pkg/clog"
"github.com/spf13/cobra"
"golang.org/x/xerrors"
)

func syncCmd() *cobra.Command {
Expand Down
5 changes: 3 additions & 2 deletionsinternal/cmd/tags.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,13 @@ import (
"encoding/json"
"os"

"github.com/spf13/cobra"
"golang.org/x/xerrors"

"cdr.dev/coder-cli/coder-sdk"
"cdr.dev/coder-cli/internal/x/xcobra"
"cdr.dev/coder-cli/pkg/clog"
"cdr.dev/coder-cli/pkg/tablewriter"
"github.com/spf13/cobra"
"golang.org/x/xerrors"
)

func tagsCmd() *cobra.Command {
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp