Skip to content

Commit 2fb5753

Browse files
authored
⬆️ AZ CLI Version update and prepare next release (#104)
* ⬆️ bumped az cli to 2.15.1 * ⬆️ prepare next release with tf 0.14 rc1 and az cli 2.15.1 * 🔧 correct env variables setup in actions
1 parent cbf91d2 commit 2fb5753

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
uses: actions/checkout@v2
4040

4141
- name: Save branch name as env var
42-
run: echo "::set-env name=BRANCH::${GITHUB_REF##*/}"
42+
run: echo "BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
4343

4444
- name: Build image
4545
run: docker image build . --file Dockerfile --tag $ORGANIZATION/$IMAGE_NAME:$BRANCH
@@ -62,7 +62,7 @@ jobs:
6262
uses: actions/checkout@master
6363

6464
- name: Save branch name as env var
65-
run: echo "::set-env name=BRANCH::${GITHUB_REF##*/}"
65+
run: echo "BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
6666

6767
- name: Download image artifact
6868
uses: actions/download-artifact@v2

.github/workflows/release.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,11 @@ jobs:
2828
- "0.11.14"
2929
- "0.12.29"
3030
- "0.13.5"
31-
- "0.14.0-beta1"
31+
- "0.14.0-rc1"
3232
azcli_version:
33-
- "2.11.1"
34-
- "2.12.1"
3533
- "2.13.0"
36-
- "2.14.0"
34+
- "2.14.2"
35+
- "2.15.1"
3736

3837
env:
3938
ORGANIZATION: "zenika"
@@ -44,10 +43,10 @@ jobs:
4443
uses: actions/checkout@v2
4544

4645
- name: Get and save release tag
47-
run: echo "::set-env name=RELEASE_TAG::${GITHUB_REF##*/}"
46+
run: echo "RELEASE_TAG=${GITHUB_REF##*/}" >> $GITHUB_ENV
4847

4948
- name: Build and save image release tag
50-
run: echo "::set-env name=IMAGE_RELEASE_TAG::release-${RELEASE_TAG}_terraform-${{ matrix.tf_version }}_azcli-${{ matrix.azcli_version }}"
49+
run: echo "IMAGE_RELEASE_TAG=release-${RELEASE_TAG}_terraform-${{ matrix.tf_version }}_azcli-${{ matrix.azcli_version }}" >> $GITHUB_ENV
5150

5251
- name: Build image
5352
run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${{ matrix.tf_version }} --build-arg AZURE_CLI_VERSION=${{ matrix.azcli_version }} --tag ${ORGANIZATION}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Setup build arguments with default versions
2-
ARG AZURE_CLI_VERSION=2.14.0
2+
ARG AZURE_CLI_VERSION=2.15.1
33
ARG TERRAFORM_VERSION=0.13.5
44
ARG PYTHON_MAJOR_VERSION=3.7
55
ARG DEBIAN_VERSION=buster-20201012-slim

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Optionally, it is possible to choose the tools desired versions using [Docker bu
7070

7171
```bash
7272
# Set tools desired versions
73-
AZURE_CLI_VERSION=2.14.0
73+
AZURE_CLI_VERSION=2.15.1
7474
TERRAFORM_VERSION=0.13.5
7575

7676
# launch the build script with parameters

tests/container-structure-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ commandTests:
2626
- name: "Check Azure CLI version"
2727
command: "az"
2828
args: ["version"]
29-
expectedOutput: ['"azure-cli": "2.14.0"']
29+
expectedOutput: ['"azure-cli": "2.15.1"']

0 commit comments

Comments
 (0)