Skip to content

Commit

Permalink
Stop building gangplank (but keep the code), drop gangplank/vendor
Browse files Browse the repository at this point in the history
Following the plan in coreos#2860 (comment)

This will help us move the Go code to the toplevel; we're going from
*three* vendor/ directories to two.  Then when we merge the mantle/
bits in we'll go down to the sanity of one vendor/ tree.

To emphasize: There's a lot of good ideas in gangplank, we're going
to be pulling *some* of this code for sure, so keep the code around
to make that explicitly easier.
  • Loading branch information
cgwalters committed Jul 20, 2022
1 parent a1fc483 commit cd428e3
Show file tree
Hide file tree
Showing 5,527 changed files with 3 additions and 1,458,956 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
9 changes: 0 additions & 9 deletions .github/workflows/lints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,10 @@ jobs:
name: golangci-lint
runs-on: ubuntu-latest
steps:
# this is needed by containers/storage which we're using in gangplank
- name: Install deps
run: sudo apt-get install -y libgpgme-dev libbtrfs-dev libdevmapper-dev
- uses: actions/setup-go@v3
with:
go-version: 1.18
- uses: actions/checkout@v3
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.46.2
working-directory: gangplank
args: --timeout=5m
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
Expand Down
15 changes: 3 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ DESTDIR ?=
# W504 line break after binary operator
PYIGNORE ?= E128,E241,E402,E501,E722,W503,W504

.PHONY: all check shellcheck flake8 pycheck unittest clean mantle mantle-check install gangplank gangplank-check tools
.PHONY: all check shellcheck flake8 pycheck unittest clean mantle mantle-check install tools

MANTLE_BINARIES := ore kola plume

all: bin/coreos-assembler tools mantle gangplank
all: bin/coreos-assembler tools mantle

src:=$(shell find src -maxdepth 1 -type f -executable -print)
pysources=$(shell find src -type f -name '*.py') $(shell for x in $(src); do if head -1 $$x | grep -q python; then echo $$x; fi; done)
Expand All @@ -39,7 +39,7 @@ bin/coreos-assembler:

shellcheck: ${src_checked} ${tests_checked} ${cwd_checked}

check: flake8 pycheck schema-check mantle-check gangplank-check cosa-go-check
check: flake8 pycheck schema-check mantle-check cosa-go-check
echo OK

pycheck:
Expand Down Expand Up @@ -78,12 +78,6 @@ $(MANTLE_BINARIES) kolet:
mantle-check:
cd mantle && $(MAKE) test

gangplank:
cd gangplank && $(MAKE)

gangplank-check:
cd gangplank && $(MAKE) test

tools:
cd tools && $(MAKE)

Expand All @@ -106,8 +100,6 @@ schema-check:
grep -q "$(DIGEST)" schema/cosa/schema_doc.go
# Are the vendored copies of the generated code synced with the
# canonical ones?
diff -u gangplank/vendor/github.com/coreos/coreos-assembler-schema/cosa/cosa_v1.go schema/cosa/cosa_v1.go
diff -u gangplank/vendor/github.com/coreos/coreos-assembler-schema/cosa/schema_doc.go schema/cosa/schema_doc.go
diff -u mantle/vendor/github.com/coreos/coreos-assembler-schema/cosa/cosa_v1.go schema/cosa/cosa_v1.go
diff -u mantle/vendor/github.com/coreos/coreos-assembler-schema/cosa/schema_doc.go schema/cosa/schema_doc.go

Expand All @@ -126,4 +118,3 @@ install:
install -d $(DESTDIR)$(PREFIX)/lib/coreos-assembler/tests/kola
cd tools && $(MAKE) install DESTDIR=$(DESTDIR)
cd mantle && $(MAKE) install DESTDIR=$(DESTDIR)
cd gangplank && $(MAKE) install DESTDIR=$(DESTDIR)
21 changes: 0 additions & 21 deletions gangplank/vendor/github.com/Azure/go-ansiterm/LICENSE

This file was deleted.

12 changes: 0 additions & 12 deletions gangplank/vendor/github.com/Azure/go-ansiterm/README.md

This file was deleted.

188 changes: 0 additions & 188 deletions gangplank/vendor/github.com/Azure/go-ansiterm/constants.go

This file was deleted.

7 changes: 0 additions & 7 deletions gangplank/vendor/github.com/Azure/go-ansiterm/context.go

This file was deleted.

49 changes: 0 additions & 49 deletions gangplank/vendor/github.com/Azure/go-ansiterm/csi_entry_state.go

This file was deleted.

38 changes: 0 additions & 38 deletions gangplank/vendor/github.com/Azure/go-ansiterm/csi_param_state.go

This file was deleted.

Loading

0 comments on commit cd428e3

Please sign in to comment.