From be16305e6ea8f0d724512b0b0380e1562b959279 Mon Sep 17 00:00:00 2001 From: "Ware, Joseph (DLSLtd,RAL,LSCI)" Date: Fri, 13 Jun 2025 13:47:35 +0100 Subject: [PATCH 1/2] Handle pinned sha versions of Python in the install_requirements action --- .github/actions/install_requirements/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install_requirements/action.yml b/.github/actions/install_requirements/action.yml index d33e0805..fd3e86d0 100644 --- a/.github/actions/install_requirements/action.yml +++ b/.github/actions/install_requirements/action.yml @@ -15,7 +15,7 @@ runs: run: | PYTHON_VERSION="${{ inputs.python-version }}" if [ $PYTHON_VERSION == "dev" ]; then - PYTHON_VERSION=$(sed -n "s/ARG PYTHON_VERSION=//p" Dockerfile) + PYTHON_VERSION=$(sed -Ene "s/ARG PYTHON_VERSION=([0-9\.]+).*/\1/p" Dockerfile) fi echo "PYTHON_VERSION=$PYTHON_VERSION" >> "$GITHUB_ENV" shell: bash From e3ca87446d7f2735afc2e7e14bd718d4c6c18bef Mon Sep 17 00:00:00 2001 From: "Ware, Joseph (DLSLtd,RAL,LSCI)" Date: Fri, 13 Jun 2025 15:40:21 +0100 Subject: [PATCH 2/2] Document the sed command --- .github/actions/install_requirements/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/install_requirements/action.yml b/.github/actions/install_requirements/action.yml index fd3e86d0..7a7bda0d 100644 --- a/.github/actions/install_requirements/action.yml +++ b/.github/actions/install_requirements/action.yml @@ -15,6 +15,7 @@ runs: run: | PYTHON_VERSION="${{ inputs.python-version }}" if [ $PYTHON_VERSION == "dev" ]; then + # python version from Dockerfile, removing potential pinned sha PYTHON_VERSION=$(sed -Ene "s/ARG PYTHON_VERSION=([0-9\.]+).*/\1/p" Dockerfile) fi echo "PYTHON_VERSION=$PYTHON_VERSION" >> "$GITHUB_ENV"