From b88209c3faea2d3c521ada48d9e498cc2abc7ef3 Mon Sep 17 00:00:00 2001
From: John Agapiou <jagapiou@google.com>
Date: Fri, 8 Dec 2023 08:37:41 -0800
Subject: [PATCH] Use full python version to avoid bad interpreter errors.

https://github.com/actions/setup-python/issues/182

PiperOrigin-RevId: 589141271
Change-Id: I5de9b0d311dab86671036b6e9dfd88b0c94bd73b
---
 .github/actions/install-concordia/action.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/actions/install-concordia/action.yml b/.github/actions/install-concordia/action.yml
index 4c814eeb..d783dbda 100644
--- a/.github/actions/install-concordia/action.yml
+++ b/.github/actions/install-concordia/action.yml
@@ -25,6 +25,7 @@ runs:
         fi
 
     - name: Set up Python ${{ inputs.python-version }}
+      id: setup-python
       uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1
       with:
         python-version: ${{ inputs.python-version }}
@@ -36,16 +37,16 @@ runs:
       uses: actions/cache/restore@v3
       with:
         path: venv
-        key: install-concordia-${{ steps.os-info.outputs.name }}-${{ steps.os-info.outputs.version }}-py${{ inputs.python-version}}-${{ hashFiles('setup.py') }}
+        key: install-concordia-${{ steps.os-info.outputs.name }}-${{ steps.os-info.outputs.version }}-py${{ steps.setup-python.outputs.version }}-${{ hashFiles('setup.py') }}
         restore-keys: |
-          install-concordia-${{ steps.os-info.outputs.name }}-${{ steps.os-info.outputs.version }}-py${{ inputs.python-version }}-
+          install-concordia-${{ steps.os-info.outputs.name }}-${{ steps.os-info.outputs.version }}-py${{ steps.os-info.outputs.version }}-py${{ steps.setup-python.outputs.version }}-
 
     - name: Install Concordia
       if: steps.restore.outputs.cache-hit != 'true'
       shell: bash
       run: |
         pip install --upgrade pip
-        pip install virtualenv
+        pip install --upgrade virtualenv
         virtualenv venv
         source venv/bin/activate
         pip install --editable .[dev]
@@ -60,10 +61,6 @@ runs:
     - name: Activate virtual environment
       shell: bash
       run: |
-        pwd
-        ls
-        ls venv
-        ls venv/bin
         source venv/bin/activate
         pip list
         echo "PATH=${PATH}" >> $GITHUB_ENV