From 4ff47256db63e8c669c6666111c7c8ae00eebe86 Mon Sep 17 00:00:00 2001 From: Cristovao Cordeiro Date: Thu, 7 Sep 2023 11:52:04 +0200 Subject: [PATCH] chore: use GH runners' yq installation --- .github/workflows/Announcements.yaml | 5 ----- .github/workflows/Documentation.yaml | 6 ------ .github/workflows/Image.yaml | 9 --------- src/notifications/requirements.sh | 8 -------- 4 files changed, 28 deletions(-) delete mode 100755 src/notifications/requirements.sh diff --git a/.github/workflows/Announcements.yaml b/.github/workflows/Announcements.yaml index c46fdf96..f9fb16f9 100644 --- a/.github/workflows/Announcements.yaml +++ b/.github/workflows/Announcements.yaml @@ -8,8 +8,6 @@ on: types: [published, updated] env: - YQ_VERSION: "v4.32.2" - YQ_BINARY: yq_linux_amd64 NAME: ${{ github.event_name == 'release' && github.event.release.name || github.event.registry_package.name }} jobs: @@ -22,9 +20,6 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Install requirements - run: ./src/notifications/requirements.sh - - name: Get image name id: get-image-name run: | diff --git a/.github/workflows/Documentation.yaml b/.github/workflows/Documentation.yaml index 9732c7d2..0a9331b2 100644 --- a/.github/workflows/Documentation.yaml +++ b/.github/workflows/Documentation.yaml @@ -127,11 +127,8 @@ jobs: ECR_CREDS_PSW: ${{ env.IS_PROD == 'true' && secrets.ECR_CREDS_PSW || secrets.ECR_CREDS_PSW_DEV }} ECR_REGISTRY_ID: ${{ env.IS_PROD == 'true' && secrets.ECR_REGISTRY_ID || secrets.ECR_REGISTRY_ID_DEV }} DOCKER_HUB_NAMESPACE: ${{ env.IS_PROD == 'true' && 'docker.io/ubuntu' || secrets.DOCKER_HUB_NAMESPACE_DEV }} - YQ_VERSION: "v4.32.2" - YQ_BINARY: yq_linux_amd64 run: | set -ex - ./src/notifications/requirements.sh ./src/docs/publish_docs.sh "${{ needs.validate-documentation-request.outputs.oci-img-name }}" "${{ steps.generate-documentation.outputs.name_doc_file }}" "${{ steps.generate-documentation.outputs.image_doc_folder }}" notify: @@ -146,9 +143,6 @@ jobs: with: python-version: '3.x' - - name: Install requirements - run: ./src/notifications/requirements.sh - - name: Summarize workflow failure message id: get-summary run: | diff --git a/.github/workflows/Image.yaml b/.github/workflows/Image.yaml index a9666e41..2d97b5e5 100644 --- a/.github/workflows/Image.yaml +++ b/.github/workflows/Image.yaml @@ -25,8 +25,6 @@ on: default: "default-id" env: - YQ_VERSION: "v4.32.2" - YQ_BINARY: yq_linux_amd64 VULNERABILITY_REPORT_SUFFIX: ".vulnerability-report.json" jobs: @@ -144,10 +142,6 @@ jobs: run: | if [ -z ${{ matrix.dockerfile-build }} ] then - wget https://github.com/mikefarah/yq/releases/download/${{ env.YQ_VERSION }}/${{ env.YQ_BINARY }} - sudo mv ${{ env.YQ_BINARY }} /usr/bin/yq - sudo chmod +x /usr/bin/yq - rock_name=`cat rockcraft.y*ml | yq -r .name` if [[ "${{ matrix.path }}" != *"${rock_name}"* ]] then @@ -650,9 +644,6 @@ jobs: - uses: actions/setup-python@v4 with: python-version: '3.x' - - - name: Install requirements - run: ./src/notifications/requirements.sh - name: Summarize workflow failure message id: get-summary diff --git a/src/notifications/requirements.sh b/src/notifications/requirements.sh deleted file mode 100755 index d8f20b41..00000000 --- a/src/notifications/requirements.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -ex - -YQ_VERSION=${YQ_VERSION:-"v4.32.2"} -YQ_BINARY=${YQ_BINARY:-"yq_linux_amd64"} - -wget -q "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/${YQ_BINARY}" -sudo mv "${YQ_BINARY}" /usr/bin/yq -sudo chmod +x /usr/bin/yq