Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[hg] update github actions to python 3 #81

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/edenscm_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/edenscm_mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/mononoke-integration_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/mononoke-integration_mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions eden/scm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ PYTHON := python
else
PYTHON := python2
endif
PYTHON3 := python3.6
PYTHON3 := python3

$(eval HGROOT := $(shell pwd))
HGPYTHONS ?= $(HGROOT)/build/pythons
Expand Down Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions eden/scm/setup3.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down