From 4063a926831bc62ed0893cbef3dbb2e11b7d0963 Mon Sep 17 00:00:00 2001
From: Justin Newberry <justin@comma.ai>
Date: Thu, 24 Aug 2023 17:03:25 -0700
Subject: [PATCH] CI: use GITHUB_ENV for env variables (#29616)

export doesn't work across steps
old-commit-hash: 90cb417caa049261797449d7e75eea01093e073d
---
 .github/workflows/selfdrive_tests.yaml | 2 +-
 .github/workflows/tools_tests.yaml     | 4 ++--
 selfdrive/test/docker_build.sh         | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml
index 0f68f425b6..5c55420508 100644
--- a/.github/workflows/selfdrive_tests.yaml
+++ b/.github/workflows/selfdrive_tests.yaml
@@ -193,7 +193,7 @@ jobs:
         submodules: true
     - name: Setup to push to repo
       run: |
-        export PUSH_IMAGE=true
+        echo "PUSH_IMAGE=true" >> "$GITHUB_ENV"
         $DOCKER_LOGIN
     - uses: ./.github/workflows/setup
       with:
diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml
index 7a7acb1c87..e92a99dba1 100644
--- a/.github/workflows/tools_tests.yaml
+++ b/.github/workflows/tools_tests.yaml
@@ -61,7 +61,7 @@ jobs:
     - name: Setup to push to repo
       if: github.ref == 'refs/heads/master' && github.repository == 'commaai/openpilot'
       run: |
-        export PUSH_IMAGE=true
+        echo "PUSH_IMAGE=true" >> "$GITHUB_ENV"
         $DOCKER_LOGIN
     - name: Build and push sim image
       run: |
@@ -82,7 +82,7 @@ jobs:
     - name: Setup to push to repo
       if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot'
       run: |
-        export PUSH_IMAGE=true
+        echo "PUSH_IMAGE=true" >> "$GITHUB_ENV"
         $DOCKER_LOGIN
     - name: Build and push docs image
       run: |
diff --git a/selfdrive/test/docker_build.sh b/selfdrive/test/docker_build.sh
index b18c48123a..c9be11ffa7 100755
--- a/selfdrive/test/docker_build.sh
+++ b/selfdrive/test/docker_build.sh
@@ -35,7 +35,7 @@ DOCKER_BUILDKIT=1 docker build --cache-to type=inline --cache-from type=registry
 
 if [[ ! -z "$PUSH_IMAGE" ]];
 then
-    docker push $REMOTE_TAG
-    docker tag $REMOTE_TAG $REMOTE_SHA_TAG
-    docker push $REMOTE_SHA_TAG
+  docker push $REMOTE_TAG
+  docker tag $REMOTE_TAG $REMOTE_SHA_TAG
+  docker push $REMOTE_SHA_TAG
 fi
\ No newline at end of file