From d51836ae91343a0f668e4c6c2952c86f87b415ed Mon Sep 17 00:00:00 2001
From: Chris Tian <chris@succinct.xyz>
Date: Thu, 22 Feb 2024 18:35:16 -0800
Subject: [PATCH] toolchain CI

---
 .github/workflows/ci.yml           |  40 ++++----
 .github/workflows/dependencies.yml | 142 -----------------------------
 2 files changed, 23 insertions(+), 159 deletions(-)
 delete mode 100644 .github/workflows/dependencies.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d5678f18ae3b..0d5091442e3b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ risc0 ]
+    branches: [succinct]
   pull_request:
-    branches: [ risc0 ]
+    branches: [succinct]
   workflow_call:
   workflow_dispatch:
 
@@ -14,37 +14,43 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: macOS
-            arch: ARM64
+          - os: macos-14
             triple: aarch64-apple-darwin
-          - os: Linux
-            arch: X64
+          - os: ubuntu-22.04
             triple: x86_64-unknown-linux-gnu
-    runs-on: [ self-hosted, prod, "${{ matrix.os }}", "${{ matrix.arch }}" ]
+          - os: ubuntu-22.04
+            triple: aarch64-unknown-linux-gnu
+    runs-on: ${{ matrix.os }}
     steps:
-      - name: Install Rust
-        uses: risc0/actions-rs-toolchain@v1
+      - uses: actions/checkout@v4
+
+      - name: Install nightly toolchain
+        id: rustc-toolchain
+        uses: actions-rs/toolchain@v1
         with:
-            toolchain: stable
+          profile: minimal
+          toolchain: nightly-2024-01-25
+          override: true
+
       - uses: lukka/get-cmake@v3.27.4
 
-      - name: Check out risc0/rust
+      - name: Check out succinctlabs/rust
         uses: actions/checkout@v3
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
           path: rust
           fetch-depth: 0
 
-      - name: Check out risc0/risc0
+      - name: Check out succinctlabs/sp1
         uses: actions/checkout@v3
         with:
-          repository: risc0/risc0
+          repository: succinctlabs/sp1
           ref: main
-          path: risc0
+          path: sp1
 
       - name: Build
-        run: GITHUB_ACTIONS=false RISC0_BUILD_DIR=$GITHUB_WORKSPACE cargo run --bin cargo-risczero -- risczero build-toolchain
-        working-directory: risc0
+        run: GITHUB_ACTIONS=false SP1_BUILD_DIR=$GITHUB_WORKSPACE cargo run --bin cargo-prove -- prove build-toolchain
+        working-directory: sp1
 
       - name: Archive build output
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
deleted file mode 100644
index 97ed891c491d..000000000000
--- a/.github/workflows/dependencies.yml
+++ /dev/null
@@ -1,142 +0,0 @@
-# Automatically run `cargo update` periodically
-
----
-name: Bump dependencies in Cargo.lock
-on:
-  schedule:
-    # Run weekly
-    - cron: '0 0 * * Sun'
-  workflow_dispatch:
-    # Needed so we can run it manually
-permissions:
-  contents: read
-defaults:
-  run:
-    shell: bash
-env:
-  # So cargo doesn't complain about unstable features
-  RUSTC_BOOTSTRAP: 1
-  PR_TITLE: Weekly `cargo update`
-  PR_MESSAGE: |
-    Automation to keep dependencies in `Cargo.lock` current.
-
-    The following is the output from `cargo update`:
-  COMMIT_MESSAGE: "cargo update \n\n"
-
-jobs:
-  not-waiting-on-bors:
-    if: github.repository_owner == 'rust-lang'
-    name: skip if S-waiting-on-bors
-    runs-on: ubuntu-latest
-    steps:
-      - env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          # Fetch state and labels of PR
-          # Or exit successfully if PR does not exist
-          JSON=$(gh pr view cargo_update --repo $GITHUB_REPOSITORY --json labels,state || exit 0)
-          STATE=$(echo "$JSON" | jq -r '.state')
-          WAITING_ON_BORS=$(echo "$JSON" | jq '.labels[] | any(.name == "S-waiting-on-bors"; .)')
-
-          # Exit with error if open and S-waiting-on-bors
-          if [[ "$STATE" == "OPEN" && "$WAITING_ON_BORS" == "true" ]]; then
-            exit 1
-          fi
-
-  update:
-    if: github.repository_owner == 'rust-lang'
-    name: update dependencies
-    needs: not-waiting-on-bors
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout the source code
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-      - name: install the bootstrap toolchain
-        run: |
-          # Extract the stage0 version
-          TOOLCHAIN=$(jq -r '.compiler | {version,date} | join("-")' -- src/stage0.json)
-          # Install and set as default
-          rustup toolchain install --no-self-update --profile minimal $TOOLCHAIN
-          rustup default $TOOLCHAIN
-
-      - name: cargo update
-        # Remove first line that always just says "Updating crates.io index"
-        run: cargo update 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
-      - name: upload Cargo.lock artifact for use in PR
-        uses: actions/upload-artifact@v3
-        with:
-          name: Cargo-lock
-          path: Cargo.lock
-          retention-days: 1
-      - name: upload cargo-update log artifact for use in PR
-        uses: actions/upload-artifact@v3
-        with:
-          name: cargo-updates
-          path: cargo_update.log
-          retention-days: 1
-
-  pr:
-    if: github.repository_owner == 'rust-lang'
-    name: amend PR
-    needs: update
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-      - name: checkout the source code
-        uses: actions/checkout@v4
-
-      - name: download Cargo.lock from update job
-        uses: actions/download-artifact@v3
-        with:
-          name: Cargo-lock
-      - name: download cargo-update log from update job
-        uses: actions/download-artifact@v3
-        with:
-          name: cargo-updates
-
-      - name: craft PR body and commit message
-        run: |
-          echo "${COMMIT_MESSAGE}" > commit.txt
-          cat cargo_update.log >> commit.txt
-
-          echo "${PR_MESSAGE}" > body.md
-          echo '```txt' >> body.md
-          cat cargo_update.log >> body.md
-          echo '```' >> body.md
-
-      - name: commit
-        run: |
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-          git switch --force-create cargo_update
-          git add ./Cargo.lock
-          git commit --no-verify --file=commit.txt
-
-      - name: push
-        run: git push --no-verify --force --set-upstream origin cargo_update
-
-      - name: edit existing open pull request
-        id: edit
-        # Don't fail job if we need to open new PR
-        continue-on-error: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          # Exit with error if PR is closed
-          STATE=$(gh pr view cargo_update --repo $GITHUB_REPOSITORY --json state --jq '.state')
-          if [[ "$STATE" != "OPEN" ]]; then
-            exit 1
-          fi
-
-          gh pr edit cargo_update --title "${PR_TITLE}" --body-file body.md --repo $GITHUB_REPOSITORY
-
-      - name: open new pull request
-        # Only run if there wasn't an existing PR
-        if: steps.edit.outcome != 'success'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh pr create --title "${PR_TITLE}" --body-file body.md --repo $GITHUB_REPOSITORY