From 43975566425de6c72b361565cdc663e5f222a52f Mon Sep 17 00:00:00 2001 From: Emerson Knapp <537409+emersonknapp@users.noreply.github.com> Date: Thu, 22 Aug 2024 08:07:15 -0700 Subject: [PATCH] Pin setuptools version in focal because newer version is broken against our other pins (#76) * Pin setuptools version in focal because newer version is broken against our other pins * Update automerge action to work, fix Dockerfile deprecation warning Signed-off-by: Emerson Knapp --- .github/workflows/automerge.yml | 5 ++--- Dockerfile | 2 +- setup-ros.sh | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 45a1ebb..dbadc55 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -16,15 +16,14 @@ jobs: auto-merge-dependabot: runs-on: ubuntu-latest steps: - - uses: pascalgn/automerge-action@v0.12.0 + - uses: pascalgn/automerge-action@v0.16.3 if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" MERGE_LABELS: "dependencies" - MERGE_METHOD: "squash" # Sqush and merge + MERGE_METHOD: "squash" # Squash and merge MERGE_COMMIT_MESSAGE: "pull-request-title-and-description" MERGE_RETRY_SLEEP: "1200000" # Retry after 20m, enough time for check suites to run UPDATE_RETRIES: "6" UPDATE_METHOD: "rebase" # Rebase PR on base branch UPDATE_RETRY_SLEEP: "300000" - diff --git a/Dockerfile b/Dockerfile index a1e5824..11cb2f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ LABEL org.label-schema.vendor="ROS Tooling Working Group" COPY setup-ros.sh /tmp/setup-ros.sh RUN /tmp/setup-ros.sh "${ROS_DISTRO}" && rm -f /tmp/setup-ros.sh -ENV LANG en_US.UTF-8 +ENV LANG=en_US.UTF-8 RUN for i in $(echo ${EXTRA_APT_PACKAGES} | tr ',' ' '); do \ apt-get install --yes --no-install-recommends "$i"; \ done diff --git a/setup-ros.sh b/setup-ros.sh index 8d3415f..34f59b6 100755 --- a/setup-ros.sh +++ b/setup-ros.sh @@ -161,7 +161,7 @@ case ${UBUNTU_VERSION} in pytest-repeat \ pytest-rerunfailures \ pytest-runner \ - setuptools \ + setuptools==58.2.0 \ pyparsing \ wheel ;;