From af23798287b32eda74fb3019bd5ece65f8ecf1f9 Mon Sep 17 00:00:00 2001
From: Martin Bruse <zondolfin@gmail.com>
Date: Mon, 3 Jun 2024 10:00:24 +0200
Subject: [PATCH] Testing new way of making Python 2.7 work.

---
 .github/workflows/go.yml     | 11 ++++-------
 diptest/start_test_server.sh |  3 +++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 4ffe35c..96f2cb2 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -18,8 +18,10 @@ jobs:
                   check-latest: true
             - name: Check Go version
               run: go version
-            - name: Set up GoogleCloudPlatform
-              uses: google-github-actions/setup-gcloud@v0
+            - name: Set up Python 2.7
+              run: sudo apt install python2.7
+            - name: Set up Cloud SDK
+              uses: google-github-actions/setup-gcloud@v2
             - name: Debug log GoogleCloudPlatform info
               run: gcloud info
             - name: Install App Engine Go
@@ -28,11 +30,6 @@ jobs:
               run: echo "GCLOUD_ROOT=$(gcloud info | grep 'Installation Root:' | sed -e 's/.*\[\([^]]\+\).*/\1/')" >> $GITHUB_ENV
             - name: Check out code
               uses: actions/checkout@v2
-            - name: Set up Python2.7
-              uses: actions/setup-python@v4
-              id: setup-python2
-              with:
-                  python-version: 2.7
             - name: Start test server
               run: ${GITHUB_WORKSPACE}/diptest/start_test_server.sh
             - name: Run tests
diff --git a/diptest/start_test_server.sh b/diptest/start_test_server.sh
index 0a623e0..30c0b54 100755
--- a/diptest/start_test_server.sh
+++ b/diptest/start_test_server.sh
@@ -1,7 +1,10 @@
 #!/bin/bash
 
+echo "Python version:"
+python --version
 echo "Starting dev_appserver.py"
 ${GCLOUD_ROOT}/bin/dev_appserver.py --require_indexes --skip_sdk_update_check=true --clear_datastore=true --datastore_consistency_policy=consistent ${GITHUB_WORKSPACE}/app.yaml > /tmp/start_test_server.log 2>&1 &
+tail -f /tmp/start_test_server.log &
 echo "Waiting for it to start serving"
 while ! curl -s -o /dev/null http://localhost:8080/; do
   sleep 10