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 <[email protected]>

Author: bors[bot]

.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:

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+=(