From 18aec3c713ff7d812d3d76489c232c3759ad8850 Mon Sep 17 00:00:00 2001
From: evandrocoan <evandrocoan@hotmail.com>
Date: Tue, 24 Mar 2020 13:51:59 -0300
Subject: [PATCH] Re-enabled the mac_checks.yml after fixing the rate limit
 issue

---
 .github/workflows/linux_checks.yml               |  4 +++-
 .../{mac_checks.yml.off => mac_checks.yml}       | 16 +++++++++-------
 .github/workflows/windows_checks.yml             |  9 ++++++---
 Makefile                                         |  9 +++++----
 4 files changed, 23 insertions(+), 15 deletions(-)
 rename .github/workflows/{mac_checks.yml.off => mac_checks.yml} (91%)

diff --git a/.github/workflows/linux_checks.yml b/.github/workflows/linux_checks.yml
index 328cecd58..e3943c5b6 100644
--- a/.github/workflows/linux_checks.yml
+++ b/.github/workflows/linux_checks.yml
@@ -57,7 +57,9 @@ jobs:
         with:
           python-version: 3.7
       - name: Set up protoc
-        uses: Arduino/actions/setup-protoc@master
+        uses: arduino/setup-protoc@v1.1.0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up node
         uses: actions/setup-node@v1
         with:
diff --git a/.github/workflows/mac_checks.yml.off b/.github/workflows/mac_checks.yml
similarity index 91%
rename from .github/workflows/mac_checks.yml.off
rename to .github/workflows/mac_checks.yml
index 5e2f86d73..c767a8ea3 100644
--- a/.github/workflows/mac_checks.yml.off
+++ b/.github/workflows/mac_checks.yml
@@ -59,7 +59,9 @@ jobs:
         with:
           python-version: 3.7
       - name: Set up protoc
-        uses: Arduino/actions/setup-protoc@master
+        uses: arduino/setup-protoc@v1.1.0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up node
         uses: actions/setup-node@v1
         with:
@@ -70,16 +72,16 @@ jobs:
           brew link gettext --force
       - name: Run develop
         run: |
-          # export SHELLFLAGS=-x
-          make develop BUILDFLAGS=""
+          export SHELLFLAGS=-x
+          make develop
       - name: Run build
         run: |
-          # export SHELLFLAGS=-x
-          make build BUILDFLAGS=""
+          export SHELLFLAGS=-x
+          make build
       - name: Run check
         run: |
-          # export SHELLFLAGS=-x
-          make check BUILDFLAGS=""
+          export SHELLFLAGS=-x
+          make check
       - name: Upload python wheels
         uses: actions/upload-artifact@v1
         with:
diff --git a/.github/workflows/windows_checks.yml b/.github/workflows/windows_checks.yml
index c02fdc875..ff66a91a1 100644
--- a/.github/workflows/windows_checks.yml
+++ b/.github/workflows/windows_checks.yml
@@ -66,7 +66,7 @@ jobs:
         with:
           path: C:\Program Files\Git
           key: ${{ runner.os }}-pacman-${{ hashFiles('**/windows_checks.yml') }}-3-
-      - name: Set up pacman, pyaudio, rsync, rename
+      - name: Set up pacman, rsync
         if: steps.cache-pacman.outputs.cache-hit != 'true'
         shell: cmd
         run: |
@@ -85,7 +85,8 @@ jobs:
           .\bash pacman-key --populate msys2
           .\bash pacman-key --refresh-keys
           .\pacman -Tv
-          .\pacman -Syuv --overwrite='*'
+          .\pacman -Syyuuv --overwrite='*'
+          .\pacman -Syuuv --overwrite='*'
           .\pacman --version
           :: We must install bash first, otherwise we will have bash fork errors:
           :: https://github.com/evandroforks/anki/runs/524857054?check_suite_focus=true
@@ -109,7 +110,9 @@ jobs:
         with:
           python-version: 3.7
       - name: Set up protoc
-        uses: Arduino/actions/setup-protoc@master
+        uses: arduino/setup-protoc@v1.1.0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up node
         uses: actions/setup-node@v1
         with:
diff --git a/Makefile b/Makefile
index c40bdf2e5..d9c1d921e 100644
--- a/Makefile
+++ b/Makefile
@@ -60,13 +60,12 @@ all: run
 # - modern pip required for wheel
 # - add qt if missing
 pyenv:
-	"${PYTHON_BIN}" -m ensurepip && \
+	# https://github.com/PyO3/maturin/issues/283
+	# Expected `python` to be a python interpreter inside a virtualenv
 	"${PYTHON_BIN}" -m pip install virtualenv && \
 	"${PYTHON_BIN}" -m venv pyenv && \
 	case "$$(uname -s)" in CYGWIN*|MINGW*|MSYS*) \
 		dos2unix "${ACTIVATE_SCRIPT}" && \
-		# https://github.com/PyO3/maturin/issues/283 \
-		# Expected `python` to be a python interpreter inside a virtualenv \
 		VIRTUAL_ENV="$$(pwd)" && \
 		VIRTUAL_ENV="$$(cygpath -m "$${VIRTUAL_ENV}")" && \
 		sed -i -- "s@VIRTUAL_ENV=\".*\"@VIRTUAL_ENV=\"$$(pwd)/pyenv\"@g" "${ACTIVATE_SCRIPT}" && \
@@ -76,7 +75,9 @@ pyenv:
 	python --version && \
 	python -m pip install --upgrade pip setuptools && \
 	${ANKI_EXTRA_PIP} && \
-	python -c 'import PyQt5' 2>/dev/null || python -m pip install -r qt/requirements.qt
+	if ! python -c 'import PyQt5' 2>/dev/null; then \
+		python -m pip install -r qt/requirements.qt; \
+	fi;
 
 # update build hash
 .PHONY: buildhash