Merge #646

646: don't push and load at the same time r=reitermarkus a=Emilgardis https://github.com/cross-rs/cross/actions/runs/1978039245 merge of #609 failed, this should fix that Co-authored-by: Emil Gardström <emil.gardstrom@gmail.com>
cross-rs · Mar 14, 2022 · 8704050 · 8704050
2 parents 5a0260b + a0b9f50
commit 8704050
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -12,7 +12,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Changelog updated
-        uses: Zomzog/changelog-checker@v1.1.0
+        uses: Zomzog/changelog-checker@v1.2.0
         with:
           fileName: CHANGELOG.md
         env:

diff --git a/build-docker-image.sh b/build-docker-image.sh
@@ -23,6 +23,8 @@ run() {
 
   if "${push}"; then
     build_args+=(--push)
+  else
+    build_args+=(--load)
   fi
 
   local dockerfile="Dockerfile.${2}"
@@ -64,7 +66,7 @@ run() {
       ;;
   esac
 
-  build_args+=(--pull --load)
+  build_args+=(--pull)
 
   if [[ -n "${GITHUB_ACTIONS-}" ]]; then
     build_args+=(