Skip to content

Commit

Permalink
Merge branch 'main' into feat/privileged-subdaos-NTRN-211
Browse files Browse the repository at this point in the history
  • Loading branch information
pr0n00gler committed Apr 25, 2024
2 parents ddd16e0 + a141684 commit 8e04ddf
Show file tree
Hide file tree
Showing 85 changed files with 25,300 additions and 650 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
inputs:
toolchain:
description: 'Default Rust Toolchain'
default: "1.71.0"
default: "1.73.0"
required: true
type: string
target:
Expand All @@ -31,7 +31,7 @@ on:
type: string

env:
TOOLCHAIN: ${{ inputs.toolchain || '1.71.0' }}
TOOLCHAIN: ${{ inputs.toolchain || '1.73.0' }}
TARGET: ${{ inputs.target || 'wasm32-unknown-unknown' }}
REF: ${{ github.event_name == 'push' && github.ref || inputs.branch || 'main' }}
ID: ${{ inputs.id || 'scheduled' }}
Expand All @@ -46,7 +46,7 @@ jobs:
ref: ${{ env.REF }}
fetch-depth: 0
- name: Save SHA
run: echo "sha=$(/usr/bin/git log -1 --format='%H')" >> $GITHUB_ENV
run: echo "sha=$(/usr/bin/git log -1 --format='%H')" >> $GITHUB_ENV
- name: Check input type
run: |
if git show-ref --quiet --heads $REF; then
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fetch-depth: 1
- uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.71.0
toolchain: 1.73.0
components: clippy
profile: minimal
override: true
Expand All @@ -31,7 +31,7 @@ jobs:
fetch-depth: 1
- uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.71.0
toolchain: 1.73.0
components: rustfmt
profile: minimal
override: true
Expand All @@ -42,14 +42,14 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macOS-latest, ubuntu-latest]
os: [ macOS-latest, ubuntu-latest ]
steps:
- uses: actions/checkout@v1
with:
fetch-depth: 1
- uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.71.0
toolchain: 1.73.0
profile: minimal
- run: cargo fetch --verbose
- run: cargo build
Expand Down
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
# will have compiled files and executables
target/

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Cargo.lock

# These are backup files generated by rustfmt
**/*.rs.bk

Expand Down
Loading

0 comments on commit 8e04ddf

Please sign in to comment.