Skip to content

Commit

Permalink
Merge branch 'main' into DAO-15-Sputnik-Factory-Init-&-Default
Browse files Browse the repository at this point in the history
  • Loading branch information
nninkovicSQA authored Oct 11, 2024
2 parents 6eea4f3 + 3d568f9 commit 5f85126
Show file tree
Hide file tree
Showing 43 changed files with 2,102 additions and 901 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ jobs:
- name: Install binaryen
run: |
set -e
curl -L https://github.com/WebAssembly/binaryen/releases/download/version_105/binaryen-version_105-x86_64-linux.tar.gz | tar xzf -
echo "`pwd`/binaryen-version_105/bin" >> $GITHUB_PATH
curl -L https://github.com/WebAssembly/binaryen/releases/download/version_119/binaryen-version_119-x86_64-linux.tar.gz | tar xzf -
echo "`pwd`/binaryen-version_119/bin" >> $GITHUB_PATH
# triggers all build.rs steps
- name: Trigger build.rs steps
run: |
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,23 @@ jobs:
tests:
strategy:
matrix:
platform: [ubuntu-latest, macos-latest]
platform: [ubuntu-22.04, macos-13]
runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: wasm32-unknown-unknown
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 20.17.0
- name: Setup dependencies
if: startsWith(matrix.platform, 'macos')
run: |
brew install llvm@14
echo /usr/local/opt/llvm@14/bin >> $GITHUB_PATH
- name: Build
env:
IS_GITHUB_ACTION: true
Expand Down
104 changes: 70 additions & 34 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Sputnik DAO

> Building on the functionality of [Sputnik V1](https://github.com/near-daos/sputnik-dao-contract-legacy), Sputnik DAO V2 offers even more features and enhanced configuration ability. Sputnik V1 is archived because it can no longer be extended. Its newer version, Sputnik V2, aims to be more flexible in this regard and it provides new features that can be opt-in by the users.
> Building on the functionality of [Sputnik V1](https://github.com/near-daos/sputnik-dao-contract-legacy), Sputnik DAO V2 offers even more features and enhanced configuration ability. Sputnik V1 is archived because it can no longer be extended. Its newer version, Sputnik V2, aims to be more flexible in this regard and it provides new features that can be opt-in by the users. [Code Review video with Trevor of CronCat](https://www.youtube.com/watch?v=M8AafQSLi7g&list=PLPxUkIZ41o-2iQWQf_wlyugF7JaY5b5bJ&index=3).
## Overview

Expand Down
Loading

0 comments on commit 5f85126

Please sign in to comment.