Workspace binaries in Linux subdir

Signed-off-by: Ian Campbell <[email protected]>
linuxkit · Jan 12, 2018 · 457e7d6 · 457e7d6
1 parent 1e91ab4
commit 457e7d6
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,7 +4,7 @@ linuxkit_pkg_build: &linuxkit_pkg_build
   steps:
     - run:
         name: Configure $PATH
-        command: echo 'export PATH=/workspace/bin:$PATH' >> $BASH_ENV
+        command: echo 'export PATH=/workspace/bin-Linux:$PATH' >> $BASH_ENV
     - run:
         name: Install packages
         # ca-certificates are needed for attach_workspace (and git over https)
@@ -38,7 +38,7 @@ image_build: &image_build
   steps:
     - run:
         name: Configure $PATH
-        command: echo 'export PATH=/workspace/bin:$PATH' >> $BASH_ENV
+        command: echo 'export PATH=/workspace/bin-Linux:$PATH' >> $BASH_ENV
     - run:
         name: Install packages
         # ca-certificates are needed for attach_workspace (and git over https)
@@ -96,7 +96,7 @@ image_boot: &image_boot
   steps:
     - run:
         name: Configure $PATH
-        command: echo 'export PATH=~/workspace/bin:$PATH' >> $BASH_ENV
+        command: echo 'export PATH=~/workspace/bin-Linux:$PATH' >> $BASH_ENV
     - run:
         name: Install packages
         # ca-certificates are needed for attach_workspace (and git over https)
@@ -152,29 +152,29 @@ jobs:
     steps:
       - run:
           name: Create workspace
-          command: mkdir -p /workspace/bin
+          command: mkdir -p /workspace/bin-Linux
       - run:
           name: Install packages
           command: apt-get update && apt-get install -y ca-certificates curl openssh-client
       - run:
           name: Fetch binaries
           command: |
             curl -fsSL -o /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-17.06.2-ce.tgz
-            tar xfO /tmp/docker.tgz docker/docker > /workspace/bin/docker
-            curl -fsSL -o /workspace/bin/linuxkit https://362-46932243-gh.circle-artifacts.com/0/linuxkit-linux-amd64
-            curl -fsSL -o /workspace/bin/manifest-tool https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64
-            curl -fsSL -o /workspace/bin/notary https://github.com/theupdateframework/notary/releases/download/v0.4.3/notary-Linux-amd64
+            tar xfO /tmp/docker.tgz docker/docker > /workspace/bin-Linux/docker
+            curl -fsSL -o /workspace/bin-Linux/linuxkit https://362-46932243-gh.circle-artifacts.com/0/linuxkit-linux-amd64
+            curl -fsSL -o /workspace/bin-Linux/manifest-tool https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64
+            curl -fsSL -o /workspace/bin-Linux/notary https://github.com/theupdateframework/notary/releases/download/v0.4.3/notary-Linux-amd64
 
             echo "Downloaded:"
-            sha256sum /workspace/bin/*
+            sha256sum /workspace/bin-Linux/*
             echo
 
             echo "Checking checksums"
             sha256sum -c <<EOF
-            6af40e74b2dbb2927882acab52d50bfc72551779d541957fc70b6adc325ee5ef  /workspace/bin/docker
-            b61188823c2491e9a1c16d275e41c68d5736f3f10577d01cb358261ff71bbad6  /workspace/bin/linuxkit
-            e4ca2ef0015a4be8597d31d9e3e70d88da33924ae72b0999e9f3b79304d4710d  /workspace/bin/manifest-tool
-            06cd02c4c2e7a3b1ad9899b03b3d4dde5392d964c675247d32f604a24661f839  /workspace/bin/notary
+            6af40e74b2dbb2927882acab52d50bfc72551779d541957fc70b6adc325ee5ef  /workspace/bin-Linux/docker
+            b61188823c2491e9a1c16d275e41c68d5736f3f10577d01cb358261ff71bbad6  /workspace/bin-Linux/linuxkit
+            e4ca2ef0015a4be8597d31d9e3e70d88da33924ae72b0999e9f3b79304d4710d  /workspace/bin-Linux/manifest-tool
+            06cd02c4c2e7a3b1ad9899b03b3d4dde5392d964c675247d32f604a24661f839  /workspace/bin-Linux/notary
             EOF
       - run:
           name: Generate SSH Keys
@@ -184,10 +184,10 @@ jobs:
       - run:
           name: Versions
           command: |
-             chmod +x /workspace/bin/docker # docker version deferred until daemon configured in relevant jobs
-             chmod +x /workspace/bin/linuxkit && /workspace/bin/linuxkit version
-             chmod +x /workspace/bin/manifest-tool && /workspace/bin/manifest-tool --version
-             chmod +x /workspace/bin/notary && /workspace/bin/notary version
+             chmod +x /workspace/bin-Linux/docker # docker version deferred until daemon configured in relevant jobs
+             chmod +x /workspace/bin-Linux/linuxkit && /workspace/bin-Linux/linuxkit version
+             chmod +x /workspace/bin-Linux/manifest-tool && /workspace/bin-Linux/manifest-tool --version
+             chmod +x /workspace/bin-Linux/notary && /workspace/bin-Linux/notary version
       - persist_to_workspace:
           root: /workspace
           paths: bin
@@ -201,7 +201,7 @@ jobs:
     steps:
       - run:
           name: Configure $PATH
-          command: echo 'export PATH=/workspace/bin:$PATH' >> $BASH_ENV
+          command: echo 'export PATH=/workspace/bin-Linux:$PATH' >> $BASH_ENV
       - run:
           name: Install packages
           # ca-certificates are needed for attach_workspace (and git over https)
@@ -325,7 +325,7 @@ jobs:
     steps:
       - run:
           name: Configure $PATH
-          command: echo 'export PATH=/workspace/bin:$PATH' >> $BASH_ENV
+          command: echo 'export PATH=/workspace/bin-Linux:$PATH' >> $BASH_ENV
       - run:
           name: Install packages
           # ca-certificates are needed for attach_workspace (and git over https)