From 9676b52c1d6c77b8dcef96219ca2e99b7b72eb1b Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Fri, 18 Oct 2024 13:04:43 +0200 Subject: [PATCH] feat: change to build yaml and add renovate comments Signed-off-by: Robert Waffen --- .github/workflows/build_container.yml | 5 ++++- .github/workflows/ci.yaml | 5 ++++- .github/workflows/security_scanning.yml | 5 ++++- build_versions.json | 20 -------------------- build_versions.yaml | 23 +++++++++++++++++++++++ 5 files changed, 35 insertions(+), 23 deletions(-) delete mode 100644 build_versions.json create mode 100644 build_versions.yaml diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml index 86d7a98..0c408d5 100644 --- a/.github/workflows/build_container.yml +++ b/.github/workflows/build_container.yml @@ -18,8 +18,11 @@ jobs: - name: Source checkout uses: actions/checkout@v4 + - name: 'Setup yq' + uses: dcarbone/install-yq-action@v1.1.1 + - id: set-matrix - run: echo "matrix=$(jq -c . build_versions.json)" >> $GITHUB_OUTPUT + run: echo "matrix=$(yq -o json build_versions.yaml | jq -c)" >> $GITHUB_OUTPUT build-and-push-container: runs-on: ubuntu-latest diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 79d62de..17a53ff 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,8 +16,11 @@ jobs: - name: Source checkout uses: actions/checkout@v4 + - name: 'Setup yq' + uses: dcarbone/install-yq-action@v1.1.1 + - id: set-matrix - run: echo "matrix=$(jq -c . build_versions.json)" >> $GITHUB_OUTPUT + run: echo "matrix=$(yq -o json build_versions.yaml | jq -c)" >> $GITHUB_OUTPUT build_test_container: name: 'Build test container' diff --git a/.github/workflows/security_scanning.yml b/.github/workflows/security_scanning.yml index a9666fa..2821002 100644 --- a/.github/workflows/security_scanning.yml +++ b/.github/workflows/security_scanning.yml @@ -18,8 +18,11 @@ jobs: - name: Source checkout uses: actions/checkout@v4 + - name: 'Setup yq' + uses: dcarbone/install-yq-action@v1.1.1 + - id: set-matrix - run: echo "matrix=$(jq -c . build_versions.json)" >> $GITHUB_OUTPUT + run: echo "matrix=$(yq -o json build_versions.yaml | jq -c)" >> $GITHUB_OUTPUT scan_ci_container: name: 'Scan CI container' diff --git a/build_versions.json b/build_versions.json deleted file mode 100644 index 6399838..0000000 --- a/build_versions.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "include": [ - { - "puppet_release": 7, - "puppet_version": "7.33.0", - "puppetdb_termini_version": "7.19.1", - "terraform_version": "1.9.5", - "pdk_version": "3.3.0.0", - "bolt_version": "3.30.0" - }, - { - "puppet_release": 8, - "puppet_version": "8.9.0", - "puppetdb_termini_version": "8.7.0", - "terraform_version": "1.9.5", - "pdk_version": "3.3.0.0", - "bolt_version": "3.30.0" - } - ] -} diff --git a/build_versions.yaml b/build_versions.yaml new file mode 100644 index 0000000..221c188 --- /dev/null +++ b/build_versions.yaml @@ -0,0 +1,23 @@ + +include: + - puppet_release: 7 + # renovate: datasource=deb depName=puppet-agent + puppet_version: "7.33.0" + # renovate: datasource=deb depName=puppetdb-termini + puppetdb_termini_version: "7.19.1" + terraform_version: "1.9.5" + # renovate: datasource=deb depName=pdk + pdk_version: "3.3.0.0" + # renovate: datasource=deb depName=puppet-bolt + bolt_version: "3.30.0" + + - puppet_release: 8 + # renovate: datasource=deb depName=puppet-agent + puppet_version: "8.9.0" + # renovate: datasource=deb depName=puppetdb-termini + puppetdb_termini_version: "8.7.0" + terraform_version: "1.9.5" + # renovate: datasource=deb depName=pdk + pdk_version: "3.3.0.0" + # renovate: datasource=deb depName=puppet-bolt + bolt_version: "3.30.0"