From 8aafb917f0a79bdec709382b48a9e194439128e7 Mon Sep 17 00:00:00 2001
From: Harry Pidcock <harry.pidcock@canonical.com>
Date: Mon, 19 Oct 2020 11:14:42 +1000
Subject: [PATCH] Fix deprecation warning in GHAs

---
 .github/workflows/smoke.yml           | 6 +++---
 .github/workflows/snap.yml            | 2 +-
 .github/workflows/static-analysis.yml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
index e42c3ef25e9..0401955fbbe 100644
--- a/.github/workflows/smoke.yml
+++ b/.github/workflows/smoke.yml
@@ -18,7 +18,7 @@ jobs:
         sudo lxd waitready
         sudo lxd init --auto
         sudo chmod a+wr /var/snap/lxd/common/lxd/unix.socket
-        echo "##[add-path]/snap/bin"
+        echo "/snap/bin" >> $GITHUB_PATH
         lxc network set lxdbr0 ipv6.address none
 
     - name: Checkout
@@ -59,7 +59,7 @@ jobs:
         OUT=$(snap info juju | grep -E "${{ matrix.snap_version }}:[[:space:]]+\^" || echo "NOT FOUND")
         set -e
         if [ "$OUT" = "NOT FOUND" ]; then
-          echo "::set-env name=RUN_TEST::RUN"
+          echo "RUN_TEST=RUN" >> $GITHUB_ENV
         fi
 
     - name: Install Dependencies
@@ -73,7 +73,7 @@ jobs:
         sudo lxd waitready
         sudo lxd init --auto
         sudo chmod a+wr /var/snap/lxd/common/lxd/unix.socket
-        echo "##[add-path]/snap/bin"
+        echo "/snap/bin" >> $GITHUB_PATH
 
     - name: Bootstrap Juju latest/stable
       if: env.RUN_TEST == 'RUN'
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index 5688614eaae..d2441e4b69d 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -18,7 +18,7 @@ jobs:
         sudo lxd waitready
         sudo lxd init --auto
         sudo chmod a+wr /var/snap/lxd/common/lxd/unix.socket
-        echo "##[add-path]/snap/bin"
+        echo "/snap/bin" >> $GITHUB_PATH
 
     - name: Checkout
       uses: actions/checkout@v2
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 14c6faef977..1c992ab1f09 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -16,8 +16,8 @@ jobs:
 
     - name: Install Dependencies
       run: |
-        echo "::set-env name=GOPATH::$(go env GOPATH)"
-        echo "::add-path::$(go env GOPATH)/bin"
+        echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
+        echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
 
         GO111MODULE=off go get -u github.com/client9/misspell/cmd/misspell
         GO111MODULE=off go get -u github.com/tsenart/deadcode