From 00f65eecda2676c52345e7d9594932007927ecdd Mon Sep 17 00:00:00 2001
From: "Zheng, Qi" <huaiqing.zq@antgroup.com>
Date: Mon, 24 Jan 2022 16:46:12 +0800
Subject: [PATCH] [ci] Set github proxy for all hw ci jobs in composite setting

---
 .../workflows/composite_action/hw/action.yml  |  6 ++++++
 .github/workflows/hw_mode_test.yml            | 20 -------------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/composite_action/hw/action.yml b/.github/workflows/composite_action/hw/action.yml
index 8988e64a..dd7e68a1 100644
--- a/.github/workflows/composite_action/hw/action.yml
+++ b/.github/workflows/composite_action/hw/action.yml
@@ -54,6 +54,12 @@ runs:
         EOF"
       shell: bash
 
+    - name: Config git proxy
+      run: |
+        docker exec ${{ env.CONTAINER_NAME }} bash -c "git config --global http.proxy socks5://localhost:5432"
+        docker exec ${{ env.CONTAINER_NAME }} bash -c "git config --global https.proxy socks5://localhost:5432"
+      shell: bash
+
     - name: Build dependencies
       run: docker exec ${{ env.CONTAINER_NAME }} bash -c "cargo uninstall sccache || true; cd /root/occlum; make submodule"
       shell: bash
diff --git a/.github/workflows/hw_mode_test.yml b/.github/workflows/hw_mode_test.yml
index 0f39157e..d9f96ab4 100644
--- a/.github/workflows/hw_mode_test.yml
+++ b/.github/workflows/hw_mode_test.yml
@@ -226,11 +226,6 @@ jobs:
         container-name: ${{ github.job }}
         build-envs: 'OCCLUM_RELEASE_BUILD=1'
 
-    - name: Config git proxy
-      run: |
-        docker exec ${{ env.CONTAINER_NAME }} bash -c "git config --global http.proxy socks5://localhost:5432"
-        docker exec ${{ env.CONTAINER_NAME }} bash -c "git config --global https.proxy socks5://localhost:5432"
-
     - name: Install bazel
       run: docker exec ${{ env.CONTAINER_NAME }} bash -c "cd /root/occlum/demos/hello_bazel && wget https://github.com/bazelbuild/bazel/releases/download/3.2.0/bazel-3.2.0-installer-linux-x86_64.sh;
               chmod +x bazel-3.2.0-installer-linux-x86_64.sh;
@@ -280,11 +275,6 @@ jobs:
         container-name: ${{ github.job }}
         build-envs: 'OCCLUM_RELEASE_BUILD=1'
 
-    - name: Config git proxy
-      run: |
-        docker exec ${{ env.CONTAINER_NAME }} bash -c "git config --global http.proxy socks5://localhost:5432"
-        docker exec ${{ env.CONTAINER_NAME }} bash -c "git config --global https.proxy socks5://localhost:5432"
-
     - name: Build Fish dependencies
       run: docker exec ${{ env.CONTAINER_NAME }} bash -c "cd /root/occlum/demos/fish && ./download_and_build.sh"
 
@@ -329,11 +319,6 @@ jobs:
         container-name: ${{ github.job }}
         build-envs: 'OCCLUM_RELEASE_BUILD=1'
 
-    - name: Config git proxy
-      run: |
-        docker exec ${{ env.CONTAINER_NAME }} bash -c "git config --global http.proxy socks5://localhost:5432"
-        docker exec ${{ env.CONTAINER_NAME }} bash -c "git config --global https.proxy socks5://localhost:5432"
-
     - name: Build xgboost dependencies
       run: docker exec ${{ env.CONTAINER_NAME }} bash -c "cd /root/occlum/demos/xgboost && ./download_and_build_xgboost.sh"
 
@@ -378,11 +363,6 @@ jobs:
         container-name: ${{ github.job }}
         build-envs: 'OCCLUM_RELEASE_BUILD=1'
 
-    - name: Config git proxy
-      run: |
-        docker exec ${{ env.CONTAINER_NAME }} bash -c "git config --global http.proxy socks5://localhost:5432"
-        docker exec ${{ env.CONTAINER_NAME }} bash -c "git config --global https.proxy socks5://localhost:5432"
-
     - name: Build sqlite dependencies
       run: docker exec ${{ env.CONTAINER_NAME }} bash -c "cd /root/occlum/demos/sqlite && ./download_and_build_sqlite.sh"