Merge pull request #22 from Oats87/build-fix

Drone CI Fixes
k3s-io · Jun 16, 2020 · 4e57c5c · 4e57c5c
2 parents 32f04ea + e1575d7
commit 4e57c5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -4,9 +4,6 @@ name: k3s-root-linux-amd64
 platform:
   os: linux
   arch: amd64
-
-workspace:
-  path: /workdir
 
 steps:
   - name: build-amd64
@@ -29,7 +26,7 @@ steps:
       checksum_flatten: true
       prerelease: true
       files:
-      - "/workdir/dist/k3s-*amd64.tar"
+      - "dist/k3s-*amd64.tar"
     when:
       instance:
       - drone-publish.rancher.io
@@ -48,9 +45,6 @@ name: k3s-root-linux-arm64
 platform:
   os: linux
   arch: amd64
-
-workspace:
-  path: /workdir
 
 steps:
   - name: build-arm64
@@ -73,7 +67,7 @@ steps:
       checksum_flatten: true
       prerelease: true
       files:
-      - "/workdir/dist/k3s-*arm64.tar"
+      - "dist/k3s-*arm64.tar"
     when:
       instance:
       - drone-publish.rancher.io
@@ -92,9 +86,6 @@ name: k3s-root-linux-arm
 platform:
   os: linux
   arch: amd64
-
-workspace:
-  path: /workdir
 
 steps:
   - name: build-arm
@@ -117,7 +108,7 @@ steps:
       checksum_flatten: true
       prerelease: true
       files:
-      - "/workdir/dist/k3s-*arm.tar"
+      - "dist/k3s-*arm.tar"
     when:
       instance:
       - drone-publish.rancher.io
@@ -136,9 +127,6 @@ name: k3s-root-linux-ppc64le
 platform:
   os: linux
   arch: amd64
-
-workspace:
-  path: /workdir
 
 steps:
   - name: build-ppc64le
@@ -161,7 +149,7 @@ steps:
       checksum_flatten: true
       prerelease: true
       files:
-      - "/workdir/dist/k3s-*ppc64le.tar"
+      - "dist/k3s-*ppc64le.tar"
     when:
       instance:
       - drone-publish.rancher.io

diff --git a/scripts/build b/scripts/build
@@ -13,7 +13,7 @@ cp -rfv /source/patches/* patches/
 
 for p in patches/*.patch; do patch -p1 -i $p; done
 
-make oldconfig
-make
+make -s oldconfig
+make -s
 
 popd