From 5ebc692a81c1d14ca316faf3f37fef2b3b5a88c8 Mon Sep 17 00:00:00 2001
From: Alex Hornby <ahornby@fb.com>
Date: Mon, 22 Mar 2021 17:56:49 +0000
Subject: [PATCH] [hg] update github actions to python 3

Updates eden/scm/Makefile to use python3 so we don't need to install multiple py versions

Adds hgext.convert.repo to setup3.py packages as mononoke tests showed it was missing
---
 .github/workflows/edenscm_linux.yml              |  4 ++--
 .github/workflows/edenscm_mac.yml                |  4 ++--
 .github/workflows/mononoke-integration_linux.yml | 13 +++++++------
 .github/workflows/mononoke-integration_mac.yml   |  8 ++------
 eden/scm/Makefile                                |  4 ++--
 eden/scm/setup3.py                               |  1 +
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/edenscm_linux.yml b/.github/workflows/edenscm_linux.yml
index a5e14bc79f12f..b5a5bfec30255 100644
--- a/.github/workflows/edenscm_linux.yml
+++ b/.github/workflows/edenscm_linux.yml
@@ -21,10 +21,10 @@ jobs:
         toolchain: 1.50.0
         default: true
         profile: minimal
-    - name: Install Python 2.7
+    - name: Install Python 3.7
       uses: actions/setup-python@v2
       with:
-        python-version: '2.7'
+        python-version: 3.7
     - name: Install system deps
       run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive eden_scm
     - name: Fetch fb303-source
diff --git a/.github/workflows/edenscm_mac.yml b/.github/workflows/edenscm_mac.yml
index 0073c3e8462c2..8b33657c9752c 100644
--- a/.github/workflows/edenscm_mac.yml
+++ b/.github/workflows/edenscm_mac.yml
@@ -19,10 +19,10 @@ jobs:
         toolchain: 1.50.0
         default: true
         profile: minimal
-    - name: Install Python 2.7
+    - name: Install Python 3.8
       uses: actions/setup-python@v2
       with:
-        python-version: '2.7'
+        python-version: 3.8
     - name: Install system deps
       run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive eden_scm
     - name: Fetch fb303-source
diff --git a/.github/workflows/mononoke-integration_linux.yml b/.github/workflows/mononoke-integration_linux.yml
index 2d24e53588440..741456ba4a568 100644
--- a/.github/workflows/mononoke-integration_linux.yml
+++ b/.github/workflows/mononoke-integration_linux.yml
@@ -29,10 +29,10 @@ jobs:
         toolchain: 1.50.0
         default: true
         profile: minimal
-    - name: Install Python 2.7
+    - name: Install Python 3.7
       uses: actions/setup-python@v2
       with:
-        python-version: '2.7'
+        python-version: 3.7
     - name: Install system deps
       run: >-
         sudo python3 build/fbcode_builder/getdeps.py
@@ -102,10 +102,6 @@ jobs:
       run: |
         rm -rf /tmp/build/build/mononoke/*
         df -h
-    - name: Install Python 3.7
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.7'
     - name: Check space before running tests
       run: df -h
     - name: Build mononoke_integration dependencies
@@ -134,6 +130,11 @@ jobs:
         --no-tests
         "$x"
         ;done
+    # Reinstall as band-aid for missing python libs in github builds
+    - name: Re-install Python 3.7
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.7
     - name: Build mononoke_integration
       run: >-
         python3 build/fbcode_builder/getdeps.py build
diff --git a/.github/workflows/mononoke-integration_mac.yml b/.github/workflows/mononoke-integration_mac.yml
index c87328957ebf5..91fe65296e5f9 100644
--- a/.github/workflows/mononoke-integration_mac.yml
+++ b/.github/workflows/mononoke-integration_mac.yml
@@ -21,10 +21,10 @@ jobs:
         toolchain: 1.50.0
         default: true
         profile: minimal
-    - name: Install Python 2.7
+    - name: Install Python 3.8
       uses: actions/setup-python@v2
       with:
-        python-version: '2.7'
+        python-version: 3.8
     - name: Install curl-openssl
       run: |
         brew install curl-openssl
@@ -80,10 +80,6 @@ jobs:
         --no-tests
         --src-dir=.
         mononoke
-    - name: Install Python 3.7
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.7'
     - name: Check space
       run: df -h
     - name: Build mononoke_integration dependencies
diff --git a/eden/scm/Makefile b/eden/scm/Makefile
index 74f0a223a61b6..3e93c52047a5f 100644
--- a/eden/scm/Makefile
+++ b/eden/scm/Makefile
@@ -21,7 +21,7 @@ PYTHON := python
 else
 PYTHON := python2
 endif
-PYTHON3 := python3.6
+PYTHON3 := python3
 
 $(eval HGROOT := $(shell pwd))
 HGPYTHONS ?= $(HGROOT)/build/pythons
@@ -142,7 +142,7 @@ install-getdeps: getdepsbuild
 test-getdeps: install-getdeps
 	# Run one test to check the binary is minimally good as will be used later in Mononoke getdeps tests
 	# Running all the tests requires a bit of filtering to run the good set (or deleting flaky ones)
-	cd tests && $(PYTHON3) run-tests.py -j1 --with-hg="$(PREFIX)/bin/$(HGNAME)" test-status.t
+	cd tests && $(PYTHON3) run-tests.py -j1 --with-hg="$(PREFIX)/bin/$(HGNAME)" test-status.t test-convert.t
 
 check: tests
 
diff --git a/eden/scm/setup3.py b/eden/scm/setup3.py
index c07cb5b594a4b..8d4ab860a22b8 100644
--- a/eden/scm/setup3.py
+++ b/eden/scm/setup3.py
@@ -1312,6 +1312,7 @@ def run(self):
     "edenscm.hgext.amend",
     "edenscm.hgext.commitcloud",
     "edenscm.hgext.convert",
+    "edenscm.hgext.convert.repo",
     "edenscm.hgext.extlib",
     "edenscm.hgext.extlib.phabricator",
     "edenscm.hgext.extlib.pywatchman",