From 75a24d2327820529e6e544432fdce67790edf6bf Mon Sep 17 00:00:00 2001
From: Wilson Lin <code@wilsonl.in>
Date: Fri, 19 Jun 2020 10:57:56 +1000
Subject: [PATCH] Attempt to fix Python and Ruby workflows

---
 .github/workflows/python.yml |  2 +-
 .github/workflows/ruby.yml   | 11 +++++++----
 python/Cargo.toml            |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 00b9c48..ee878a9 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -86,7 +86,7 @@ jobs:
           pip install --upgrade setuptools
           pip install --upgrade twine
       - name: Install B2 CLI
-        run: pip install --upgrade b2
+        run: sudo pip install --upgrade b2
       - name: Pack and publish package
         working-directory: ./python
         run: |
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index c32c731..4c6795b 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -48,10 +48,13 @@ jobs:
       - name: Set up rbenv (Linux)
         if: runner.os == 'Linux'
         shell: bash -l {0}
+        # rbenv-installer now uses Linux brew to install Ruby, which we do not want.
         run: |
           sudo apt install -y autoconf bison build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm5 libgdbm-dev
-          wget -O install-rbenv.sh https://github.com/rbenv/rbenv-installer/raw/master/bin/rbenv-installer
-          bash install-rbenv.sh || true # Ignore rbenv-doctor.
+          git clone https://github.com/rbenv/rbenv.git ~/.rbenv
+          echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bash_profile
+          mkdir -p "$HOME/.rbenv/plugins"
+          git clone https://github.com/rbenv/ruby-build.git "$HOME/.rbenv/plugins/ruby-build"
       - name: Set up Ruby
         shell: bash -l {0}
         run: |
@@ -95,8 +98,8 @@ jobs:
           ruby-version: '2.5'
       - name: Install B2 CLI
         run: |
-          pip install setuptools
-          pip install --upgrade b2
+          sudo pip install setuptools
+          sudo pip install --upgrade b2
       - name: Pack and publish gem
         working-directory: ./ruby
         run: |
diff --git a/python/Cargo.toml b/python/Cargo.toml
index 222c578..0f3275f 100644
--- a/python/Cargo.toml
+++ b/python/Cargo.toml
@@ -12,5 +12,5 @@ crate-type = ["cdylib"]
 [dependencies]
 hyperbuild = "0.1.0"
 [dependencies.pyo3]
-version = "0.9.0-alpha.1"
+version = "=0.9.0-alpha.1"
 features = ["extension-module"]