From 8d020856335c5199cb7b2483321ccec094c25846 Mon Sep 17 00:00:00 2001
From: Max Halford <maxhalford25@gmail.com>
Date: Sat, 17 Apr 2021 00:44:38 +0200
Subject: [PATCH] fix ci

---
 .github/workflows/dev-docs.yml | 86 +++++++++++++++++-----------------
 .github/workflows/pypi.yml     |  4 +-
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/dev-docs.yml b/.github/workflows/dev-docs.yml
index e1f610cdc1..f6f1e59f10 100644
--- a/.github/workflows/dev-docs.yml
+++ b/.github/workflows/dev-docs.yml
@@ -9,45 +9,47 @@ jobs:
   ubuntu:
     runs-on: ubuntu-latest
     steps:
-
-    - uses: actions/checkout@v2
-
-    - name: Install Ubuntu dependencies
-      run: sudo apt-get install graphviz pandoc
-
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.8
-
-    - name: Cache Python dependencies
-      uses: actions/cache@v2
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Install Python dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install wheel
-        pip install -e ".[docs]"
-
-    - name: Build docs
-      run: make doc
-
-    - name: Deploy docs
-      env:
-        GH_TOKEN: ${{ secrets.GitHubToken }}
-      run: |
-        git config user.name github-actions
-        git config user.email github-actions@github.com
-        git config pull.rebase false
-
-        git fetch
-        git checkout gh-pages
-        git pull
-
-        git checkout master
-        mike deploy dev --push --remote https://github.com/online-ml/river.git
+      - uses: actions/checkout@v2
+
+      - name: Install Ubuntu dependencies
+        run: sudo apt-get install graphviz pandoc
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+
+      - name: Cache Python dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+
+      - name: Install Python dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install wheel
+          pip install -e ".[docs]"
+
+      - name: Build docs
+        run: make doc
+
+      - name: Deploy docs
+        env:
+          GH_TOKEN: ${{ secrets.GitHubToken }}
+        run: |
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+          git config pull.rebase false
+
+          git add --all
+          git commit -m "Release dev docs"
+
+          git fetch
+          git checkout gh-pages
+          git pull
+
+          git checkout master
+          mike deploy dev --push --remote https://github.com/online-ml/river.git
diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
index fef0a0802a..64d2ed9658 100644
--- a/.github/workflows/pypi.yml
+++ b/.github/workflows/pypi.yml
@@ -14,8 +14,6 @@ jobs:
     env:
       CIBW_BUILD: "cp36-* cp37-* cp38-*"
       CIBW_BEFORE_BUILD: "pip install cython"
-      PYPI_USER: ${{ secrets.PYPI_USER }}
-      PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
     steps:
       - uses: actions/checkout@v2
 
@@ -41,4 +39,4 @@ jobs:
           cibuildwheel --output-dir dist
           python setup.py sdist
           ls dist
-          twine upload dist/* -u ${PYPI_USER} -p ${PYPI_PASSWORD}
+          twine upload dist/* -u ${{ secrets.pypi_user }} -p ${{ secrets.pypi_password }}