Skip to content

Commit 8e73b35

Browse files
authored
⬆️ Update Azure and Terraform CLI versions (#78)
* ⬆️ update TF and AZ cli default version and tests * ⬆️ prepare CLI release version update * 🚚 rename lint build test action * ✏️ correct release action typo
1 parent ab67628 commit 8e73b35

File tree

5 files changed

+22
-12
lines changed

5 files changed

+22
-12
lines changed

.github/workflows/build-test.yml renamed to .github/workflows/lint-build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: build-test
1+
name: lint-build-test
22

33
# trigger on any push
44
# but not on master, tags or readme modifications

.github/workflows/release.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,13 @@ jobs:
2929
strategy:
3030
matrix:
3131
versions:
32-
- { tf_version: "0.11.14", awscli_version: "2.5.1" }
33-
- { tf_version: "0.12.24", awscli_version: "2.5.1" }
34-
- { tf_version: "0.12.25", awscli_version: "2.5.1" }
32+
- { tf_version: "0.11.14", azcli_version: "2.7.0" }
33+
- { tf_version: "0.12.26", azcli_version: "2.7.0" }
3534

3635
env:
3736
TF_VERSION: ${{ matrix.versions.tf_version }}
38-
AWS_CLI_VERSIOIN: ${{ matrix.versions.awscli_version }}
39-
IMAGE_TAG: "tf${{ matrix.versions.tf_version }}-azcli${{ matrix.versions.awscli_version }}"
37+
AWS_CLI_VERSIOIN: ${{ matrix.versions.azcli_version }}
38+
IMAGE_TAG: "tf${{ matrix.versions.tf_version }}-azcli${{ matrix.versions.azcli_version }}"
4039

4140
steps:
4241
- name: Check out the repo

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Setup build arguments with default versions
2-
ARG AZURE_CLI_VERSION=2.5.1
3-
ARG TERRAFORM_VERSION=0.12.25
2+
ARG AZURE_CLI_VERSION=2.7.0
3+
ARG TERRAFORM_VERSION=0.12.26
44
ARG PYTHON_MAJOR_VERSION=3.7
55

66
# Download Terraform binary
@@ -44,7 +44,7 @@ RUN apt-get update \
4444
ca-certificates=20190110 \
4545
git=1:2.20.1-2+deb10u3 \
4646
python3=${PYTHON_MAJOR_VERSION}.3-1 \
47-
python3-distutils=3.7.3-1 \
47+
python3-distutils=${PYTHON_MAJOR_VERSION}.3-1 \
4848
&& apt-get clean \
4949
&& rm -rf /var/lib/apt/lists/* \
5050
&& update-alternatives --install /usr/bin/python python /usr/bin/python${PYTHON_MAJOR_VERSION} 1

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![build-test](https://github.com/Zenika/terraform-azure-cli/workflows/build-test/badge.svg)](https://github.com/Zenika/terraform-azure-cli/actions?query=workflow%3Abuild-test)
1+
[![lint-build-test](https://github.com/Zenika/terraform-azure-cli/workflows/lint-build-test/badge.svg)](https://github.com/Zenika/terraform-azure-cli/actions?query=workflow%3Alint-build-test)
22
[![push-latest](https://github.com/Zenika/terraform-azure-cli/workflows/push-latest/badge.svg)](https://github.com/Zenika/terraform-azure-cli/actions?query=workflow%3Apush-latest)
33
[![release](https://github.com/Zenika/terraform-azure-cli/workflows/release/badge.svg)](https://github.com/Zenika/terraform-azure-cli/actions?query=workflow%3Arelease)
44

tests/container-structure-tests.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,22 @@ metadataTest:
88
workdir: "/workspace"
99

1010
commandTests:
11+
- name: "Check Python version"
12+
command: "python"
13+
args: ["--version"]
14+
expectedOutput: ["Python 3.7.3"]
15+
16+
- name: "Check Git version"
17+
command: "git"
18+
args: ["--version"]
19+
expectedOutput: ["git version 2.20.1"]
20+
1121
- name: "Check Terraform CLI version"
1222
command: "terraform"
1323
args: ["version"]
14-
expectedOutput: ["Terraform v0.12.25"]
24+
expectedOutput: ["Terraform v0.12.26"]
25+
1526
- name: "Check Azure CLI version"
1627
command: "az"
1728
args: ["version"]
18-
expectedOutput: ["\"azure-cli\": \"2.5.1\""]
29+
expectedOutput: ["\"azure-cli\": \"2.7.0\""]

0 commit comments

Comments
 (0)