Merge branch 'master' into remove-travis

inteI-cloud · Nov 30, 2020 · 9ed0d25 · 9ed0d25
2 parents 0057037 + 1bf8ef9
commit 9ed0d25
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 41 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -59,13 +59,23 @@ jobs:
         run: |
           ./hack/build_ci_first_pass binaries
         env:
-          CACHE_DIR: /tmp/.buildkit-cache/${{ env.CACHEKEY_BINARIES }}
+          CACHEDIR_FROM: /tmp/.buildkit-cache/${{ env.CACHEKEY_BINARIES }}
+          CACHEDIR_TO: /tmp/.buildkit-cache/${{ env.CACHEKEY_BINARIES }}-new
       -
         name: Build ${{ env.CACHEKEY_INTEGRATION_TESTS }}
         run: |
           ./hack/build_ci_first_pass integration-tests
         env:
-          CACHE_DIR: /tmp/.buildkit-cache/${{ env.CACHEKEY_INTEGRATION_TESTS }}
+          CACHEDIR_FROM: /tmp/.buildkit-cache/${{ env.CACHEKEY_INTEGRATION_TESTS }}
+          CACHEDIR_TO: /tmp/.buildkit-cache/${{ env.CACHEKEY_INTEGRATION_TESTS }}-new
+      -
+        # FIXME: Temp fix for https://github.com/moby/buildkit/issues/1850
+        name: Move cache
+        run: |
+          rm -rf /tmp/.buildkit-cache/${{ env.CACHEKEY_BINARIES }}
+          mv /tmp/.buildkit-cache/${{ env.CACHEKEY_BINARIES }}-new /tmp/.buildkit-cache/${{ env.CACHEKEY_BINARIES }}
+          rm -rf /tmp/.buildkit-cache/${{ env.CACHEKEY_INTEGRATION_TESTS }}
+          mv /tmp/.buildkit-cache/${{ env.CACHEKEY_INTEGRATION_TESTS }}-new /tmp/.buildkit-cache/${{ env.CACHEKEY_INTEGRATION_TESTS }}
 
   test:
     runs-on: ubuntu-latest
@@ -131,7 +141,7 @@ jobs:
           TESTPKGS: ${{ matrix.pkg }}
           TESTFLAGS: -v --parallel=6 --timeout=20m
           SKIP_INTEGRATION_TESTS: ${{ matrix.skip-integration-tests }}
-          CACHE_DIR: /tmp/.buildkit-cache/${{ env.CACHEKEY_INTEGRATION_TESTS }} /tmp/.buildkit-cache/${{ env.CACHEKEY_BINARIES }}
+          CACHEDIR_FROM: /tmp/.buildkit-cache/${{ env.CACHEKEY_INTEGRATION_TESTS }} /tmp/.buildkit-cache/${{ env.CACHEKEY_BINARIES }}
       -
         name: Upload coverage file
         uses: actions/upload-artifact@v2
@@ -244,7 +254,14 @@ jobs:
         env:
           PLATFORMS: ${{ env.PLATFORMS }},darwin/amd64,windows/amd64
           RUNC_PLATFORMS: ${{ env.PLATFORMS }}
-          CACHE_DIR: /tmp/.buildkit-cache/${{ env.CACHEKEY_CROSS }}
+          CACHEDIR_FROM: /tmp/.buildkit-cache/${{ env.CACHEKEY_CROSS }}
+          CACHEDIR_TO: /tmp/.buildkit-cache/${{ env.CACHEKEY_CROSS }}-new
+      -
+        # FIXME: Temp fix for https://github.com/moby/buildkit/issues/1850
+        name: Move cache
+        run: |
+          rm -rf /tmp/.buildkit-cache/${{ env.CACHEKEY_CROSS }}
+          mv /tmp/.buildkit-cache/${{ env.CACHEKEY_CROSS }}-new /tmp/.buildkit-cache/${{ env.CACHEKEY_CROSS }}
 
   release-base:
     runs-on: ubuntu-latest
@@ -276,12 +293,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - target-stage: ''
-          - target-stage: rootless
+        target-stage:
+          - ''
+          - rootless
     steps:
       -
-        name: Checkout${{ env.CACHEKEY_BINARIES }}
+        name: Checkout
         uses: actions/checkout@v2
       -
         name: Cache image${{ matrix.target-stage }}
@@ -320,7 +337,14 @@ jobs:
           ./hack/images "${{ needs.release-base.outputs.tag }}" "$REPO_SLUG_TARGET" "${{ needs.release-base.outputs.push }}"
         env:
           TARGET: ${{ matrix.target-stage }}
-          CACHE_DIR: /tmp/.buildkit-cache/${{ env.CACHEKEY_CROSS }} /tmp/.buildkit-cache/image${{ matrix.target-stage }}
+          CACHEDIR_FROM: /tmp/.buildkit-cache/${{ env.CACHEKEY_CROSS }} /tmp/.buildkit-cache/image${{ matrix.target-stage }}
+          CACHEDIR_TO: /tmp/.buildkit-cache/image${{ matrix.target-stage }}-new
+      -
+        # FIXME: Temp fix for https://github.com/moby/buildkit/issues/1850
+        name: Move cache
+        run: |
+          rm -rf /tmp/.buildkit-cache/image${{ matrix.target-stage }}
+          mv /tmp/.buildkit-cache/image${{ matrix.target-stage }}-new /tmp/.buildkit-cache/image${{ matrix.target-stage }}
 
   binaries:
     runs-on: ubuntu-latest
@@ -359,7 +383,7 @@ jobs:
           ./hack/release-tar "${{ needs.release-base.outputs.tag }}" release-out
         env:
           PLATFORMS: ${{ env.PLATFORMS }},darwin/amd64,windows/amd64
-          CACHE_DIR: /tmp/.buildkit-cache/${{ env.CACHEKEY_BINARIES }} /tmp/.buildkit-cache/${{ env.CACHEKEY_CROSS }}
+          CACHEDIR_FROM: /tmp/.buildkit-cache/${{ env.CACHEKEY_BINARIES }} /tmp/.buildkit-cache/${{ env.CACHEKEY_CROSS }}
       -
         name: Move artifacts
         run: |
@@ -384,6 +408,7 @@ jobs:
 
   frontend-base:
     runs-on: ubuntu-latest
+    if: github.event_name != 'schedule'
     outputs:
       typ: ${{ steps.prep.outputs.typ }}
       tag: ${{ steps.prep.outputs.tag }}
@@ -396,11 +421,7 @@ jobs:
           TYP=master
           TAG=mainline
           PUSH=false
-          if [ "${{ github.event_name }}" = "schedule" ]; then
-            TYP=daily
-            TAG=_
-            PUSH=push
-          elif [[ $GITHUB_REF == refs/tags/dockerfile/* ]]; then
+          if [[ $GITHUB_REF == refs/tags/dockerfile/* ]]; then
             TYP=tag
             TAG=${GITHUB_REF#refs/tags/}
             PUSH=push
@@ -413,6 +434,7 @@ jobs:
 
   frontend-image:
     runs-on: ubuntu-latest
+    if: github.event_name != 'schedule'
     needs: [frontend-base, test]
     steps:
       -
@@ -446,11 +468,18 @@ jobs:
         run: |
           ./frontend/dockerfile/cmd/dockerfile-frontend/hack/release "${{ needs.frontend-base.outputs.typ }}" "${{ needs.frontend-base.outputs.tag }}" "$DF_REPO_SLUG_TARGET" "${{ needs.frontend-base.outputs.push }}"
         env:
-          CACHE_DIR: /tmp/.buildkit-cache/frontend-${{ needs.frontend-base.outputs.typ }}
+          CACHEDIR_FROM: /tmp/.buildkit-cache/frontend-${{ needs.frontend-base.outputs.typ }}
+          CACHEDIR_TO: /tmp/.buildkit-cache/frontend-${{ needs.frontend-base.outputs.typ }}-new
       -
         name: Build ${{ needs.frontend-base.outputs.typ }}/labs
         if: needs.frontend-base.outputs.typ == 'master'
         run: |
           ./frontend/dockerfile/cmd/dockerfile-frontend/hack/release "${{ needs.frontend-base.outputs.typ }}" labs "$DF_REPO_SLUG_TARGET" "${{ needs.frontend-base.outputs.push }}"
         env:
-          CACHE_DIR: /tmp/.buildkit-cache/frontend-${{ needs.frontend-base.outputs.typ }}
+          CACHEDIR_FROM: /tmp/.buildkit-cache/frontend-${{ needs.frontend-base.outputs.typ }}
+      -
+        # FIXME: Temp fix for https://github.com/moby/buildkit/issues/1850
+        name: Move cache
+        run: |
+          rm -rf /tmp/.buildkit-cache/frontend-${{ needs.frontend-base.outputs.typ }}
+          mv /tmp/.buildkit-cache/frontend-${{ needs.frontend-base.outputs.typ }}-new /tmp/.buildkit-cache/frontend-${{ needs.frontend-base.outputs.typ }}
diff --git a/frontend/dockerfile/cmd/dockerfile-frontend/hack/release b/frontend/dockerfile/cmd/dockerfile-frontend/hack/release
@@ -68,9 +68,11 @@ fi
 importCacheFlags=""
 exportCacheFlags=""
 if [ "$GITHUB_ACTIONS" = "true" ]; then
-  if [ -n "$cacheref" ]; then
-    importCacheFlags="--cache-from=type=local,src=$cacheref"
-    exportCacheFlags="--cache-to=type=local,dest=$cacheref"
+  if [ -n "$cacheRefFrom" ]; then
+    importCacheFlags="--cache-from=type=local,src=$cacheRefFrom"
+  fi
+  if [ -n "$cacheRefTo" ]; then
+    exportCacheFlags="--cache-to=type=local,dest=$cacheRefTo"
   fi
 fi
 

diff --git a/hack/build_ci_first_pass b/hack/build_ci_first_pass
@@ -17,9 +17,11 @@ fi
 importCacheFlags=""
 exportCacheFlags=""
 if [ "$GITHUB_ACTIONS" = "true" ]; then
-  if [ -n "$cacheref" ]; then
-    importCacheFlags="--cache-from=type=local,src=$cacheref"
-    exportCacheFlags="--cache-to=type=local,dest=$cacheref"
+  if [ -n "$cacheRefFrom" ]; then
+    importCacheFlags="--cache-from=type=local,src=$cacheRefFrom"
+  fi
+  if [ -n "$cacheRefTo" ]; then
+    exportCacheFlags="--cache-to=type=local,dest=$cacheRefTo"
   fi
 fi
 

diff --git a/hack/cross b/hack/cross
@@ -8,9 +8,11 @@ set -e
 importCacheFlags=""
 exportCacheFlags=""
 if [ "$GITHUB_ACTIONS" = "true" ]; then
-  if [ -n "$cacheref" ]; then
-    importCacheFlags="--cache-from=type=local,src=$cacheref"
-    exportCacheFlags="--cache-to=type=local,dest=$cacheref"
+  if [ -n "$cacheRefFrom" ]; then
+    importCacheFlags="--cache-from=type=local,src=$cacheRefFrom"
+  fi
+  if [ -n "$cacheRefTo" ]; then
+    exportCacheFlags="--cache-to=type=local,dest=$cacheRefTo"
   fi
 fi
 

diff --git a/hack/images b/hack/images
@@ -67,8 +67,8 @@ if [[ "$versionTag" == "$TAG" ]]; then
 fi
 
 importCacheFlags="--cache-from=type=registry,ref=$tagMain$tagLatest "
-if [[ -n "$cacheref" ]] && [[ "$cachetype" = "local" ]]; then
-  for ref in $cacheref; do
+if [[ -n "$cacheRefFrom" ]] && [[ "$cacheType" = "local" ]]; then
+  for ref in $cacheRefFrom; do
     importCacheFlags="$importCacheFlags--cache-from=type=local,src=$ref "
   done
 fi
@@ -77,8 +77,10 @@ if [ -n "$localmode" ]; then
 fi
 
 exportCacheFlags=""
-if [ "$PUSH" = "push" ]; then
-  exportCacheFlags="--cache-to=type=inline "
+if [[ -n "$cacheRefTo" ]] && [[ "$cacheType" = "local" ]]; then
+  exportCacheFlags="--cache-to=type=local,dest=$cacheRefTo "
+elif [ "$PUSH" = "push" ]; then
+  exportCacheFlags="$exportCacheFlags--cache-to=type=inline "
 fi
 
 buildxCmd build $targetFlag $importCacheFlags $exportCacheFlags $outputFlag \

diff --git a/hack/release-tar b/hack/release-tar
@@ -18,8 +18,8 @@ if [ -z "$TAG" ] || [ -z "$OUT" ]; then
 fi
 
 importCacheFlags=""
-if [[ -n "$cacheref" ]] && [[ "$cachetype" = "local" ]]; then
-  for ref in $cacheref; do
+if [[ -n "$cacheRefFrom" ]] && [[ "$cacheType" = "local" ]]; then
+  for ref in $cacheRefFrom; do
     importCacheFlags="$importCacheFlags--cache-from=type=local,src=$ref "
   done
 fi

diff --git a/hack/test b/hack/test
@@ -18,13 +18,13 @@ if [ "$TEST_DOCKERD" == "1" ] && ! file $TEST_DOCKERD_BINARY | grep "statically
 fi
 
 importCacheFlags=""
-if [ -n "$cacheref" ]; then
-  if [ "$cachetype" = "local" ]; then
-    for ref in $cacheref; do
+if [ -n "$cacheRefFrom" ]; then
+  if [ "$cacheType" = "local" ]; then
+    for ref in $cacheRefFrom; do
       importCacheFlags="$importCacheFlags--cache-from=type=local,src=$ref "
     done
   else
-    importCacheFlags="--cache-from=type=registry,ref=$cacheref:integration-tests "
+    importCacheFlags="--cache-from=type=registry,ref=$cacheRefFrom:integration-tests "
   fi
 fi
 

diff --git a/hack/util b/hack/util
@@ -5,7 +5,8 @@ export BUILDX_NO_DEFAULT_LOAD=true
 : ${PREFER_LEGACY=}
 : ${CI=}
 : ${GITHUB_ACTIONS=}
-: ${CACHE_DIR=}
+: ${CACHEDIR_FROM=}
+: ${CACHEDIR_TO=}
 
 if [ "$PREFER_BUILDCTL" = "1" ]; then
   echo >&2 "WARNING: PREFER_BUILDCTL is no longer supported. Ignoring."
@@ -36,13 +37,15 @@ buildxCmd() {
   fi
 }
 
-cachetype=""
-cacheref=""
+cacheType=""
+cacheRefFrom=""
+cacheRefTo=""
 currentref=""
 if [ "$GITHUB_ACTIONS" = "true" ]; then
   currentref="git://github.com/$GITHUB_REPOSITORY#$GITHUB_REF"
-  cachetype="local"
-  cacheref="$CACHE_DIR"
+  cacheType="local"
+  cacheRefFrom="$CACHEDIR_FROM"
+  cacheRefTo="$CACHEDIR_TO"
 fi
 
 currentcontext="."