Merge branch 'evol262-fix/noshim'

fxkjnj · Dec 10, 2021 · 542e27d · 542e27d
2 parents e31cdf7 + 4ea4b19
commit 542e27d
Show file tree

Hide file tree

Showing 171 changed files with 12,012 additions and 5,481 deletions.
diff --git a/.github/workflows/local-up.yml → .github/workflows/e2e.yml b/.github/workflows/local-up.yml → .github/workflows/e2e.yml
diff --git a/.github/workflows/main.yml → .github/workflows/integration.yml b/.github/workflows/main.yml → .github/workflows/integration.yml
diff --git a/.github/workflows/build.yml → .github/workflows/publish.yml b/.github/workflows/build.yml → .github/workflows/publish.yml
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+.idea
+vendor
+src/cri-dockerd
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-APP_DIR:=$(CURDIR)
+APP_DIR:=$(CURDIR)/src
 PACKAGING_DIR:=$(CURDIR)/packaging
 VERSION=$(shell cat VERSION)
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.0-dev
+0.2.0-dev