From cfd2076846ebfaa8af784687ac304a9b4ce65786 Mon Sep 17 00:00:00 2001 From: snickerjp Date: Mon, 10 Feb 2025 13:03:06 +0000 Subject: [PATCH] fix: resolve workflow and Dockerfile issues - Add faraday-retry gem installation - Update GitHub Actions permissions - Pin wget version in Dockerfiles to comply with Trunk --- .github/workflows/create-release-pr.yml | 18 ++++++++++++------ docker/innovation/Dockerfile | 2 +- docker/lts/Dockerfile | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml index ed2bb8f..a05419a 100644 --- a/.github/workflows/create-release-pr.yml +++ b/.github/workflows/create-release-pr.yml @@ -8,7 +8,10 @@ on: - "**.md" workflow_dispatch: -permissions: read-all +permissions: + contents: write + pull-requests: write + issues: write jobs: create-release-pr: @@ -24,16 +27,19 @@ jobs: ruby-version: 3.2 bundler-cache: true - - name: Configure Git + - name: Install dependencies run: | - git config --global user.email github-actions[bot]@users.noreply.github.com - git config --global user.name github-actions[bot] + gem install faraday-retry + gem install git-pr-release --no-document - - name: Install git-pr-release - run: gem install git-pr-release --no-document + - name: Configure Git + run: | + git config --global user.email "github-actions[bot]@users.noreply.github.com" + git config --global user.name "github-actions[bot]" - name: Create Release PR env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GIT_PR_RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN }} GIT_PR_RELEASE_BRANCH_PRODUCTION: main GIT_PR_RELEASE_BRANCH_STAGING: develop diff --git a/docker/innovation/Dockerfile b/docker/innovation/Dockerfile index 1478f88..9c7b619 100644 --- a/docker/innovation/Dockerfile +++ b/docker/innovation/Dockerfile @@ -7,7 +7,7 @@ ARG MYSQL_SHELL_VERSION=9.2.0 RUN useradd -ms /bin/bash mysqlshelluser RUN apt-get update && apt-get install -y \ - wget \ + wget=1.21.* \ && rm -rf /var/lib/apt/lists/* \ && wget https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell_${MYSQL_SHELL_VERSION}-1debian12_amd64.deb \ && apt-get update \ diff --git a/docker/lts/Dockerfile b/docker/lts/Dockerfile index b089283..1a1b175 100644 --- a/docker/lts/Dockerfile +++ b/docker/lts/Dockerfile @@ -7,7 +7,7 @@ ARG MYSQL_SHELL_VERSION=8.4.4 RUN useradd -ms /bin/bash mysqlshelluser RUN apt-get update && apt-get install -y \ - wget \ + wget=1.21.* \ && rm -rf /var/lib/apt/lists/* \ && wget https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell_${MYSQL_SHELL_VERSION}-1debian12_amd64.deb \ && apt-get update \