Merge pull request #4746 from estesp/cp-4745-1.4

estesp · web-flow · commit 957bcaa9fffe · 2020-11-17T18:56:20.000-05:00
[release/1.4] cherry-pick: Update other actions for env/path CVE fix
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -23,7 +23,13 @@ jobs:
           GOPATH: ${{ runner.workspace }}
           GO111MODULE: off
         with:
-          path: ./src/github.com/containerd/containerd
+          path: src/github.com/containerd/containerd
+
+      - name: Set env
+        shell: bash
+        run: |
+          echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
+          echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
 
       #
       # Build
@@ -134,7 +140,13 @@ jobs:
           GOPATH: ${{ runner.workspace }}
           GO111MODULE: off
         with:
-          path: ./src/github.com/containerd/containerd
+          path: src/github.com/containerd/containerd
+
+      - name: Set env
+        shell: bash
+        run: |
+          echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
+          echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
 
       - name: Build amd64
         env:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -75,10 +75,10 @@ jobs:
           [[ "${MOS}" =~ "windows" ]] && {
             os=windows
           }
-          echo "::set-env name=RELEASE_VER::${releasever}"
-          echo "::set-env name=GOPATH::${{ github.workspace }}"
-          echo "::set-env name=OS::${os}"
-          echo "::add-path::${{ github.workspace }}/bin"
+          echo "RELEASE_VER=${releasever}" >> $GITHUB_ENV
+          echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
+          echo "OS=${os}" >> $GITHUB_ENV
+          echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
 
       - name: Checkout containerd
         uses: actions/checkout@v2
