Skip to content

Commit

Permalink
Merge pull request #476 from EspressoSystems/fix/view-1-hack
Browse files Browse the repository at this point in the history
Remove special case for VID in view 1
  • Loading branch information
jbearer authored Mar 15, 2024
2 parents 8e2427e + add2d9d commit 1ce8763
Show file tree
Hide file tree
Showing 14 changed files with 1,081 additions and 187 deletions.
8 changes: 8 additions & 0 deletions .github/actions/install-capnp/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: Install Capn Proto
runs:
using: composite
steps:
- run: |
sudo apt-get update
sudo apt-get install -y capnproto
shell: bash
8 changes: 2 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,8 @@ jobs:
- uses: actions/checkout@v4
name: Checkout Repository

- uses: dtolnay/rust-toolchain@stable

- name: Configure Git
run: |
git config --global url."https://ancient123:${{ secrets.ORG_GITHUB_PAT }}@github.com".insteadOf git://github.com
git config --global url."https://ancient123:${{ secrets.ORG_GITHUB_PAT }}@github.com".insteadOf ssh://git@github.com
- name: Install capnproto
uses: ./.github/actions/install-capnp

- uses: Swatinem/rust-cache@v2
name: Enable Rust Caching
Expand Down
13 changes: 4 additions & 9 deletions .github/workflows/build_nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,16 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 90
steps:
- name: Configure Git
run: |
git config --global url."https://ancient123:${{ secrets.ORG_GITHUB_PAT }}@github.com/".insteadOf git://github.com/
git config --global url."https://ancient123:${{ secrets.ORG_GITHUB_PAT }}@github.com/".insteadOf ssh://git@github.com/
- name: Checkout Repository
uses: actions/checkout@v4

- name: Install Nix
uses: cachix/install-nix-action@v26

# - uses: cachix/cachix-action@v12
# with:
# name: espresso-systems-private
# authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- uses: cachix/cachix-action@v12
with:
name: espresso-systems-private
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'

- name: Cache cargo
uses: actions/cache@v4.0.1
Expand Down
54 changes: 0 additions & 54 deletions .github/workflows/build_windows.yml

This file was deleted.

5 changes: 0 additions & 5 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 120
steps:
- name: Configure Git
run: |
git config --global url."https://ancient123:${{ secrets.ORG_GITHUB_PAT }}@github.com/".insteadOf git://github.com/
git config --global url."https://ancient123:${{ secrets.ORG_GITHUB_PAT }}@github.com/".insteadOf ssh://git@github.com/
- name: Checkout Repository
uses: actions/checkout@v4

Expand Down
14 changes: 5 additions & 9 deletions .github/workflows/debug_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,18 @@ jobs:
RUST_LOG: info
RUST_MIN_STACK: '3145728'
steps:
- uses: dtolnay/rust-toolchain@stable
- uses: actions/checkout@v4
name: Checkout Repository

- name: Install capnproto
uses: ./.github/actions/install-capnp

- uses: styfle/cancel-workflow-action@0.12.1
name: Cancel Outdated Builds
with:
all_but_latest: true
access_token: ${{ github.token }}

- uses: actions/checkout@v4
name: Checkout Repository

- name: Configure Git
run: |
git config --global url."https://ancient123:${{ secrets.ORG_GITHUB_PAT }}@github.com".insteadOf git://github.com
git config --global url."https://ancient123:${{ secrets.ORG_GITHUB_PAT }}@github.com".insteadOf ssh://git@github.com
- uses: Swatinem/rust-cache@v2
name: Enable Rust Caching

Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,8 @@ jobs:
- uses: actions/checkout@v4
name: Checkout Repository

- uses: dtolnay/rust-toolchain@stable

- name: Configure Git
run: |
git config --global url."https://ancient123:${{ secrets.ORG_GITHUB_PAT }}@github.com".insteadOf git://github.com
git config --global url."https://ancient123:${{ secrets.ORG_GITHUB_PAT }}@github.com".insteadOf ssh://git@github.com
- name: Install capnproto
uses: ./.github/actions/install-capnp

- uses: Swatinem/rust-cache@v2
name: Enable Rust Caching
Expand Down
Loading

0 comments on commit 1ce8763

Please sign in to comment.