Skip to content

Commit

Permalink
fix rust on CI (#96)
Browse files Browse the repository at this point in the history
* fix: override rust, and set as default

* fix build apps on ci

* correct runner

* remove rust action

---------

Co-authored-by: Juan Leni <[email protected]>
  • Loading branch information
emmanuelm41 and jleni authored Jul 17, 2024
1 parent 85fb533 commit a4a7371
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 24 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Install rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
- name: Lint and format 💅
uses: cpp-linter/cpp-linter-action@v2
id: linter
Expand Down
20 changes: 1 addition & 19 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ jobs:
uses: actions/checkout@v4
with:
submodules: true
- name: Install rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
- name: Build Standard app
id: build
shell: bash -l {0}
Expand Down Expand Up @@ -144,10 +140,6 @@ jobs:
submodules: true
- name: Install deps
run: pip install ledgerblue
- name: Install rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
- name: Build NanoS
shell: bash -l {0}
run: |
Expand Down Expand Up @@ -183,11 +175,6 @@ jobs:
submodules: true
- name: Install deps
run: pip install ledgerblue

- name: Install rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
- name: Build NanoSP
shell: bash -l {0}
run: |
Expand All @@ -210,7 +197,7 @@ jobs:
build_package_stax:
needs: [configure, build, build_ledger, test_zemu]
if: ${{ github.ref == 'refs/heads/main' }}
runs-on: zondax-runners
runs-on: ${{ github.repository_owner == 'zondax' && 'zondax-runners' || 'ubuntu-latest' }}
container:
image: zondax/ledger-app-builder:latest
options: --user ${{ needs.configure.outputs.uid_gid }}
Expand All @@ -223,11 +210,6 @@ jobs:
submodules: true
- name: Install deps
run: pip install ledgerblue

- name: Install rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
- name: Build Stax
shell: bash -l {0}
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
publish_npm_package:
runs-on: ubuntu-latest
runs-on: ${{ github.repository_owner == 'zondax' && 'zondax-runners' || 'ubuntu-latest' }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down

0 comments on commit a4a7371

Please sign in to comment.