Update CI for bootstrapping

.github/workflows/bootstrap.yml

@@ -21,19 +21,13 @@ jobs:
     name: Bootstrap on Linux
     runs-on: ubuntu-18.04
     steps:
-      - name: Set PATH
-        run: |
-          echo "::add-path::/opt/ghc/8.6.5/bin"
       - uses: actions/checkout@v2
-      - name: bootstrap.sh
-        env:
-          EXTRA_CONFIGURE_OPTS: ""
+      - name: bootstrap.py
         run: |
-          cd cabal-install
-          sh ./bootstrap.sh --no-doc
+          python3 bootstrap/bootstrap.py -w /opt/ghc/8.6.5/bin/ghc -d bootstrap/linux-8.6.5.json
       - name: Smoke test
         run: |
-          $HOME/.cabal/bin/cabal --version
+          packages/tmp/bin/cabal --version
 
   boostrap-macos:
     name: Bootstrap on macOS
@@ -47,17 +41,13 @@ jobs:
           cd ghc-*
           ./configure --prefix=/opt/ghc/8.6.5
           sudo make install
-      - name: Set PATH
-        run: |
-          echo "::add-path::/opt/ghc/8.6.5/bin"
-          echo "::add-path::$HOME/.cabal/bin"
       - uses: actions/checkout@v2
-      - name: bootstrap.sh
-        env:
-          EXTRA_CONFIGURE_OPTS: ""
+
+      # We use linux dependencies
+      - name: bootstrap.py
         run: |
-          cd cabal-install
-          sh ./bootstrap.sh --no-doc
+          python3 bootstrap/bootstrap.py -w /opt/ghc/8.6.5/bin/ghc -d bootstrap/linux-8.6.5.json
+
       - name: Smoke test
         run: |
-          $HOME/.cabal/bin/cabal --version
+          packages/tmp/bin/cabal --version

templates/ci-bootstrap.template.yml

@@ -21,19 +21,13 @@ jobs:
     name: Bootstrap on Linux
     runs-on: ubuntu-18.04
     steps:
-      - name: Set PATH
-        run: |
-          echo "::add-path::/opt/ghc/8.6.5/bin"
       - uses: actions/checkout@v2
-      - name: bootstrap.sh
-        env:
-          EXTRA_CONFIGURE_OPTS: ""
+      - name: bootstrap.py
         run: |
-          cd cabal-install
-          sh ./bootstrap.sh --no-doc
+          python3 bootstrap/bootstrap.py -w /opt/ghc/8.6.5/bin/ghc -d bootstrap/linux-8.6.5.json
       - name: Smoke test
         run: |
-          $HOME/.cabal/bin/cabal --version
+          packages/tmp/bin/cabal --version
 
   boostrap-macos:
     name: Bootstrap on macOS
@@ -47,17 +41,13 @@ jobs:
           cd ghc-*
           ./configure --prefix=/opt/ghc/8.6.5
           sudo make install
-      - name: Set PATH
-        run: |
-          echo "::add-path::/opt/ghc/8.6.5/bin"
-          echo "::add-path::$HOME/.cabal/bin"
       - uses: actions/checkout@v2
-      - name: bootstrap.sh
-        env:
-          EXTRA_CONFIGURE_OPTS: ""
+
+      # We use linux dependencies
+      - name: bootstrap.py
         run: |
-          cd cabal-install
-          sh ./bootstrap.sh --no-doc
+          python3 bootstrap/bootstrap.py -w /opt/ghc/8.6.5/bin/ghc -d bootstrap/linux-8.6.5.json
+
       - name: Smoke test
         run: |
-          $HOME/.cabal/bin/cabal --version
+          packages/tmp/bin/cabal --version