Skip to content

Commit

Permalink
Fix downloadscript for istioctl for 1.10+ (#60)
Browse files Browse the repository at this point in the history
Signed-off-by: Takeshi Yoneda <[email protected]>
  • Loading branch information
mathetake authored Aug 4, 2021
1 parent 5a4c18e commit 46a6ddc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
e2e-test:
strategy:
matrix:
os: [ ubuntu-latest ] # TODO: once kind is available for macos, test against it
os: [ ubuntu-latest ]
name: e2e test
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -107,8 +107,10 @@ jobs:
with:
go-version: 1.16.5

- name: setup kind cluster
uses: engineerd/[email protected]
- uses: debianmaster/actions-k3s@master
id: k3s
with:
version: 'v1.21.2-k3s1'

- uses: actions/cache@v2
with:
Expand Down
7 changes: 1 addition & 6 deletions src/istioctl/donwload_script.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,7 @@ ARCH_SUPPORTED=$(echo "$ISTIO_VERSION" | awk '{ ARCH_SUPPORTED=substr($0, 1, 3)
ARCH_UNSUPPORTED="1.5"
if [ "${OS}" = "Linux" ] ; then
# This checks if 1.6 <= 1.5 or 1.4 <= 1.5
if [ "$(expr "${ARCH_SUPPORTED}" \<= "${ARCH_UNSUPPORTED}")" -eq 1 ]; then
without_arch
else
with_arch
fi
with_arch
elif [ "x${OS}" = "xDarwin" ] ; then
without_arch
else
Expand Down

0 comments on commit 46a6ddc

Please sign in to comment.