From 1595e79004c533e835c897b76673a952e1a4738c Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 23:22:47 +0000 Subject: [PATCH 01/28] update .gitignore --- .gitignore | 50 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 766d4ad..042b19d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,45 @@ -# Environments -.env +# This file is centrally managed as a template file in https://github.com/canonical/solutions-engineering-automation +# To update the file: +# - Edit it in the canonical/solutions-engineering-automation repository. +# - Open a PR with the changes. +# - When the PR merges, the soleng-terraform bot will open a PR to the target repositories with the changes. + +# Python Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# Test files and directories +.pytest_cache/ +.coverage +.tox +reports/ +**/report/ +htmlcov/ +.mypy_cache + +# python virtual environments (for local dev) .venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ +venv +env -# Snap +# Build artefacts +output/ +.build/ +build/ +*.charm *.snap +# python build artefacts +deb_dist/ +dist/ +*.egg-info/ + +# Log files +*.log + +# general backup files +*~ +*.bak + +# Note: for editor-specific files, please don't add them here, as they are specific to your environment, not the project. +# Instead, consider using a global gitignore on your workstation. From 70b4b1a83f3787f7e2ccc557e2bf16df51199373 Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 11:29:14 +0000 Subject: [PATCH 02/28] update .gitignore From 4d05427377e0e3248b6e848b0c215095f2c49907 Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 11:29:15 +0000 Subject: [PATCH 03/28] update .github/workflows/release.yaml --- .github/workflows/release.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ae3a2d8..2dd06b4 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -17,8 +17,12 @@ jobs: secrets: inherit release: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.runs-on }} needs: check + strategy: + fail-fast: false + matrix: + runs-on: [[ubuntu-22.04]] outputs: snap: ${{ steps.build.outputs.snap }} steps: @@ -27,9 +31,11 @@ jobs: fetch-depth: 0 # Complete git history is required to generate the version from git tags. - uses: snapcore/action-build@v1 id: build + - name: Determine system architecture + run: echo "SYSTEM_ARCH=$(uname -m)" >> $GITHUB_ENV - uses: actions/upload-artifact@v4 with: - name: snap + name: snap_${{ env.SYSTEM_ARCH }} path: ${{ steps.build.outputs.snap }} - uses: snapcore/action-publish@v1 env: From 979908fc22e8465b31f41a0105b5e824f7ac5c46 Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 11:29:17 +0000 Subject: [PATCH 04/28] update .github/workflows/check.yaml --- .github/workflows/check.yaml | 50 +++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 5bc07fd..45452fb 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -37,11 +37,59 @@ jobs: yamllint .yamllint snap/snapcraft.yaml build: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.runs-on }} + strategy: + fail-fast: false + matrix: + runs-on: [[ubuntu-22.04]] steps: - uses: actions/checkout@v4 with: fetch-depth: 0 # Complete git history is required to generate the version from git tags. - name: Verify snap builds successfully + id: build uses: snapcore/action-build@v1 + + - name: Determine system architecture + run: echo "SYSTEM_ARCH=$(uname -m)" >> $GITHUB_ENV + + - name: Upload the built snap + uses: actions/upload-artifact@v4 + with: + name: snap_${{ env.SYSTEM_ARCH }} + path: ${{ steps.build.outputs.snap }} + + func: + needs: + - build + runs-on: ${{ matrix.runs-on }} + strategy: + fail-fast: false + matrix: + runs-on: [[ubuntu-22.04]] + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 # Complete git history is required to generate the version from git tags. + + - name: Determine system architecture + run: echo "SYSTEM_ARCH=$(uname -m)" >> $GITHUB_ENV + + - name: Download the built snap + uses: actions/download-artifact@v4 + with: + name: snap_${{ env.SYSTEM_ARCH }} + + - name: Set up Python 3.10 + uses: actions/setup-python@v5 + with: + python-version: "3.10" + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install 'tox<5' + + - name: Run functional tests + run: tox -e func From a831109e42fde2eb2f9abecbdbdf4cd526b8e4bd Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 23:27:29 +0000 Subject: [PATCH 05/28] update .github/workflows/release.yaml From a4749b56ec8b601f6ac11940d4bdc48a1454851c Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 23:27:30 +0000 Subject: [PATCH 06/28] update .gitignore From 118b54b079b46c3427631ba54be02d5dec463af7 Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 23:27:31 +0000 Subject: [PATCH 07/28] update .github/workflows/check.yaml From 2ee8edf6df16e93659bae0d185c087fdb8040e12 Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 23:28:22 +0000 Subject: [PATCH 08/28] update .github/workflows/release.yaml From 80b19f8dbe9c31339c9f2917c0eda2922376f0a6 Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 23:28:23 +0000 Subject: [PATCH 09/28] update .gitignore From 96846426b170acb8f0a2960a63027a4bdfc01ace Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 23:28:25 +0000 Subject: [PATCH 10/28] update .github/workflows/check.yaml --- .github/workflows/check.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 45452fb..ec20426 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -37,6 +37,8 @@ jobs: yamllint .yamllint snap/snapcraft.yaml build: + needs: + - lint runs-on: ${{ matrix.runs-on }} strategy: fail-fast: false @@ -63,7 +65,7 @@ jobs: func: needs: - build - runs-on: ${{ matrix.runs-on }} + runs-on: ${{ matrix.runs-on }} strategy: fail-fast: false matrix: From 033197b097160c0db6c09fc2c1d1ee95111a0c4d Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 21:06:14 +0000 Subject: [PATCH 11/28] update .github/workflows/release.yaml From 1b8452bbd345ba78684980251a0072eb5c216068 Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 21:06:15 +0000 Subject: [PATCH 12/28] update .gitignore From 937f76e2e9e01301637ba8cf91a701f71b8bef60 Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 21:06:17 +0000 Subject: [PATCH 13/28] update .github/workflows/check.yaml From f680c596670296dcb9e411e7eb645654478c5b10 Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 06:41:15 +0000 Subject: [PATCH 14/28] update .github/workflows/check.yaml From f185426669ba21a346d40e9418b3bbfe3fb7e79b Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 06:41:17 +0000 Subject: [PATCH 15/28] update .github/workflows/release.yaml From fde1d5886549c6e4f7528b59e4a99e596eca8178 Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 06:41:18 +0000 Subject: [PATCH 16/28] update .gitignore From 2abba86ee5e65bc6a656f94625d6e10475363c7f Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 02:00:48 +0000 Subject: [PATCH 17/28] update .gitignore From 3c86651e8f08a8501a6b2e674fa5a6dee12ba0c1 Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 02:00:49 +0000 Subject: [PATCH 18/28] update .github/workflows/release.yaml From 770dcaf8e5e26a4f2ea0b4c73c9b1a0ff26b2b22 Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 02:00:50 +0000 Subject: [PATCH 19/28] update .github/workflows/check.yaml From d0ca6d49f3f3d631cfba29e26d72bea40a04df4f Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 07:38:42 +0000 Subject: [PATCH 20/28] update .github/workflows/release.yaml From 56b2daa881fc5a08d54c8976e0f8a18f280c123b Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 07:38:44 +0000 Subject: [PATCH 21/28] update .gitignore From bd7bb3b1a2f648613eb5325b449df1c5e762eaa3 Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 07:38:45 +0000 Subject: [PATCH 22/28] update .github/workflows/check.yaml From 8d8372d831d30590931ba8c4dd95019a561d5490 Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:10:11 +0000 Subject: [PATCH 23/28] update .gitignore From 5d8558a0c9e6c47619f62bd1fda283a58e4dcb85 Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:10:13 +0000 Subject: [PATCH 24/28] update .github/workflows/release.yaml From d8c96219b754063d713e264549e8040ec09dec39 Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:10:14 +0000 Subject: [PATCH 25/28] update .github/workflows/check.yaml --- .github/workflows/check.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index ec20426..491f2ae 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -27,10 +27,22 @@ jobs: with: fetch-depth: 0 # Complete git history is required to generate the version from git tags. + - name: Set up Python 3.10 + uses: actions/setup-python@v5 + with: + python-version: "3.10" + - name: Install dependencies run: | sudo apt update sudo apt install -y yamllint + python -m pip install --upgrade pip + # pin tox to the current major version to avoid + # workflows breaking all at once when a new major version is released. + python -m pip install 'tox<5' + + - name: Run linters + run: tox -e lint - name: Lint yaml files run: | From ec8d2eca7270bead12f590ae140b4019632ea822 Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 20:28:04 +0000 Subject: [PATCH 26/28] update .gitignore From de24a9739f67142282d9130ec97e9357a21a4222 Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 20:28:06 +0000 Subject: [PATCH 27/28] update .github/workflows/release.yaml --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2dd06b4..8ad27af 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 # Complete git history is required to generate the version from git tags. - - uses: snapcore/action-build@v1 + - uses: canonical/action-build@v1 id: build - name: Determine system architecture run: echo "SYSTEM_ARCH=$(uname -m)" >> $GITHUB_ENV From f937c5c2a88c3cc2e5ee6e8375eb3ae8dd4d6763 Mon Sep 17 00:00:00 2001 From: "soleng-terraform[bot]" <168111096+soleng-terraform[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 20:28:07 +0000 Subject: [PATCH 28/28] update .github/workflows/check.yaml --- .github/workflows/check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 491f2ae..7d279cd 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -63,7 +63,7 @@ jobs: - name: Verify snap builds successfully id: build - uses: snapcore/action-build@v1 + uses: canonical/action-build@v1 - name: Determine system architecture run: echo "SYSTEM_ARCH=$(uname -m)" >> $GITHUB_ENV