fix(setup): ignore comment lines in env files (autowarefoundation#328)

Signed-off-by: Kenji Miyake <[email protected]>
TomohitoAndo · May 23, 2022 · 717e197 · 717e197
1 parent 1447719
commit 717e197
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/docker-build-and-push-self-hosted.yaml b/.github/workflows/docker-build-and-push-self-hosted.yaml
@@ -25,9 +25,9 @@ jobs:
 
       - name: Load env
         run: |
-          cat amd64.env | sed "/^#/d" >> $GITHUB_ENV
+          cat amd64.env | sed -e "s/^\s*//" -e "/^#/d" >> $GITHUB_ENV
           if [ "$(uname -m)" = "aarch64" ]; then
-            cat arm64.env | sed "/^#/d" >> $GITHUB_ENV
+            cat arm64.env | sed -e "s/^\s*//" -e "/^#/d" >> $GITHUB_ENV
           fi
 
       - name: Build 'autoware-universe'

diff --git a/.github/workflows/docker-build-and-push.yaml b/.github/workflows/docker-build-and-push.yaml
@@ -20,9 +20,9 @@ jobs:
 
       - name: Load env
         run: |
-          cat amd64.env | sed "/^#/d" >> $GITHUB_ENV
+          cat amd64.env | sed -e "s/^\s*//" -e "/^#/d" >> $GITHUB_ENV
           if [ "$(uname -m)" = "aarch64" ]; then
-            cat arm64.env | sed "/^#/d" >> $GITHUB_ENV
+            cat arm64.env | sed -e "s/^\s*//" -e "/^#/d" >> $GITHUB_ENV
           fi
 
       - name: Build 'autoware-universe'

diff --git a/setup-dev-env.sh b/setup-dev-env.sh
@@ -73,7 +73,7 @@ fi
 
 # Add env args
 # shellcheck disable=SC2013
-for env_name in $(sed "s/=.*//" <amd64.env); do
+for env_name in $(sed -e "s/^\s*//" -e "/^#/d" -e "s/=.*//" <amd64.env); do
     ansible_args+=("--extra-vars" "${env_name}=${!env_name}")
 done