Allow push with GitHub Actions

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
inteI-cloud · Nov 26, 2020 · 6557fc5 · 6557fc5
1 parent 7437b47
commit 6557fc5
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 57 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -66,10 +66,6 @@ jobs:
           ./hack/build_ci_first_pass integration-tests
         env:
           CACHE_DIR: /tmp/.buildkit-cache/${{ env.CACHEKEY_INTEGRATION_TESTS }}
-      -
-        name: Dump context
-        if: always()
-        uses: crazy-max/ghaction-dump-context@v1
 
   test:
     runs-on: ubuntu-latest
@@ -271,7 +267,6 @@ jobs:
             TAG=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
             PUSH=push
           fi
-          PUSH=false # FIXME: Remove when migration to GitHub Actions completed
           echo ::set-output name=tag::${TAG}
           echo ::set-output name=push::${PUSH}
 
@@ -412,7 +407,6 @@ jobs:
           elif [[ $GITHUB_REF == refs/heads/* ]]; then
             PUSH=push
           fi
-          PUSH=false # FIXME: Remove when migration to GitHub Actions completed
           echo ::set-output name=typ::${TYP}
           echo ::set-output name=tag::${TAG}
           echo ::set-output name=push::${PUSH}

diff --git a/.travis.yml b/.travis.yml
@@ -62,57 +62,57 @@ jobs:
         - TARGET=rootless ./hack/images local $REPO_SLUG_TARGET
       name: "Build image"
       if: type == cron
-    - stage: deploy
-      script: skip
-      name: "Deploy"
-      if: type != pull_request
-      deploy:
-        - provider: script
-          script: ./hack/images master $REPO_SLUG_TARGET push && TARGET=rootless ./hack/images master $REPO_SLUG_TARGET push
-          on:
-            repo: moby/buildkit
-            branch: master
-            condition: $TRAVIS_EVENT_TYPE != "cron"
-        - provider: script
-          script: ./hack/images $TRAVIS_TAG $REPO_SLUG_TARGET push && TARGET=rootless ./hack/images $TRAVIS_TAG $REPO_SLUG_TARGET push && PLATFORMS="${PLATFORMS},darwin/amd64,windows/amd64" ./hack/release-tar $TRAVIS_TAG release-out
-          on:
-            repo: moby/buildkit
-            tags: true
-            condition: $TRAVIS_TAG =~ ^v[0-9]
-        - provider: releases
-          api_key:
-            secure: "hA0L2F6O1MLEJEbUDzxokpO6F6QrAIkltmVG3g0tTAoVj1xtCOXSmH3cAnVbFYyOz9q8pa/85tbpyEEIHVlqvWk2a5/QS16QaBW6XxH+FiZ3oQ44JbtpsjpmBFxdhfeFs8Ca6Nj29AOtDx21HHWsZKlBZFvC4Ubc05AM1rgZpJyZVDvYsjZIunc8/CPCbvAAp6RLnLHxAYXF+TQ7mAZP2SewsW/61nPjPIp2P4d93CduA9kUSxtC/1ewmU2T9Ak2X1Nw2ecPTonGjO51xNa6Ebo1hsbsRt5Krd1IR5rSkgXqLrhQO+19J3sUrQr2p8su6hCTKXR5TQz9L5C9VG8T3yOLbA7/FKBndWgBCm7EB7SezhFkm91e3Phkd/Hi5PF4ZKUSKyOYORHpoeg7ggBXaQF5r0OolqvNjxe7EhE+zlUIqnk5eprVrXT8H1QDF0Jg7pfdqVV9AIZO6i+e+1wOVDaP6K6tiWGdkRFH0wahcucZ/8xVoa8JVNZKke2mMCuLGsNWcN4DeLhkxa6giw3tkqbnY+eTYcW/PyVFMAVsZ8rOjQu4u4mm82FYBI7UywWQJTReD1LO2ibxHk74nwtyauX7KsCPFh2CA27DKlsQ1/xkjaCpE6vduzKzPj2DSHp6tKjxn2edPWRI+/4JxLD6KUFX1f1KqD0pKy/qVsZhEPI="
-          file: release-out/**/*
-          skip_cleanup: true
-          file_glob: true
-          on:
-            repo: moby/buildkit
-            tags: true
-            condition: $TRAVIS_TAG =~ ^v[0-9]
-        - provider: script
-          script: ./frontend/dockerfile/cmd/dockerfile-frontend/hack/release master mainline $DF_REPO_SLUG_TARGET push
-          on:
-            repo: moby/buildkit
-            branch: master
-            condition: $TRAVIS_EVENT_TYPE != "cron"
-        - provider: script
-          script: ./frontend/dockerfile/cmd/dockerfile-frontend/hack/release master labs $DF_REPO_SLUG_TARGET push
-          on:
-            repo: moby/buildkit
-            branch: master
-            condition: $TRAVIS_EVENT_TYPE != "cron"
-        - provider: script
-          script: ./frontend/dockerfile/cmd/dockerfile-frontend/hack/release tag $TRAVIS_TAG $DF_REPO_SLUG_TARGET push
-          on:
-            repo: moby/buildkit
-            tags: true
-            condition: $TRAVIS_TAG =~ ^dockerfile/[0-9]
-        - provider: script
-          script: ./frontend/dockerfile/cmd/dockerfile-frontend/hack/release daily _ $DF_REPO_SLUG_TARGET push
-          on:
-            repo: moby/buildkit
-            branch: master
-            condition: $TRAVIS_EVENT_TYPE == "cron"
+#    - stage: deploy
+#      script: skip
+#      name: "Deploy"
+#      if: type != pull_request
+#      deploy:
+#        - provider: script
+#          script: ./hack/images master $REPO_SLUG_TARGET push && TARGET=rootless ./hack/images master $REPO_SLUG_TARGET push
+#          on:
+#            repo: moby/buildkit
+#            branch: master
+#            condition: $TRAVIS_EVENT_TYPE != "cron"
+#        - provider: script
+#          script: ./hack/images $TRAVIS_TAG $REPO_SLUG_TARGET push && TARGET=rootless ./hack/images $TRAVIS_TAG $REPO_SLUG_TARGET push && PLATFORMS="${PLATFORMS},darwin/amd64,windows/amd64" ./hack/release-tar $TRAVIS_TAG release-out
+#          on:
+#            repo: moby/buildkit
+#            tags: true
+#            condition: $TRAVIS_TAG =~ ^v[0-9]
+#        - provider: releases
+#          api_key:
+#            secure: "hA0L2F6O1MLEJEbUDzxokpO6F6QrAIkltmVG3g0tTAoVj1xtCOXSmH3cAnVbFYyOz9q8pa/85tbpyEEIHVlqvWk2a5/QS16QaBW6XxH+FiZ3oQ44JbtpsjpmBFxdhfeFs8Ca6Nj29AOtDx21HHWsZKlBZFvC4Ubc05AM1rgZpJyZVDvYsjZIunc8/CPCbvAAp6RLnLHxAYXF+TQ7mAZP2SewsW/61nPjPIp2P4d93CduA9kUSxtC/1ewmU2T9Ak2X1Nw2ecPTonGjO51xNa6Ebo1hsbsRt5Krd1IR5rSkgXqLrhQO+19J3sUrQr2p8su6hCTKXR5TQz9L5C9VG8T3yOLbA7/FKBndWgBCm7EB7SezhFkm91e3Phkd/Hi5PF4ZKUSKyOYORHpoeg7ggBXaQF5r0OolqvNjxe7EhE+zlUIqnk5eprVrXT8H1QDF0Jg7pfdqVV9AIZO6i+e+1wOVDaP6K6tiWGdkRFH0wahcucZ/8xVoa8JVNZKke2mMCuLGsNWcN4DeLhkxa6giw3tkqbnY+eTYcW/PyVFMAVsZ8rOjQu4u4mm82FYBI7UywWQJTReD1LO2ibxHk74nwtyauX7KsCPFh2CA27DKlsQ1/xkjaCpE6vduzKzPj2DSHp6tKjxn2edPWRI+/4JxLD6KUFX1f1KqD0pKy/qVsZhEPI="
+#          file: release-out/**/*
+#          skip_cleanup: true
+#          file_glob: true
+#          on:
+#            repo: moby/buildkit
+#            tags: true
+#            condition: $TRAVIS_TAG =~ ^v[0-9]
+#        - provider: script
+#          script: ./frontend/dockerfile/cmd/dockerfile-frontend/hack/release master mainline $DF_REPO_SLUG_TARGET push
+#          on:
+#            repo: moby/buildkit
+#            branch: master
+#            condition: $TRAVIS_EVENT_TYPE != "cron"
+#        - provider: script
+#          script: ./frontend/dockerfile/cmd/dockerfile-frontend/hack/release master labs $DF_REPO_SLUG_TARGET push
+#          on:
+#            repo: moby/buildkit
+#            branch: master
+#            condition: $TRAVIS_EVENT_TYPE != "cron"
+#        - provider: script
+#          script: ./frontend/dockerfile/cmd/dockerfile-frontend/hack/release tag $TRAVIS_TAG $DF_REPO_SLUG_TARGET push
+#          on:
+#            repo: moby/buildkit
+#            tags: true
+#            condition: $TRAVIS_TAG =~ ^dockerfile/[0-9]
+#        - provider: script
+#          script: ./frontend/dockerfile/cmd/dockerfile-frontend/hack/release daily _ $DF_REPO_SLUG_TARGET push
+#          on:
+#            repo: moby/buildkit
+#            branch: master
+#            condition: $TRAVIS_EVENT_TYPE == "cron"
 
 before_deploy:
   - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin