Merge pull request #7 from scrtlabs/secret-cw1.1

Secret cw1.1

Author: toml01

.circleci/config.yml

@@ -0,0 +1,18 @@
+# install-rust
+
+A small github action to install `rustup` and a Rust toolchain. This is
+generally expressed inline, but it was repeated enough in this repository it
+seemed worthwhile to extract.
+
+Some gotchas:
+
+- Can't `--self-update` on Windows due to permission errors (a bug in Github
+  Actions)
+- `rustup` isn't installed on macOS (a bug in Github Actions)
+
+When the above are fixed we should delete this action and just use this inline:
+
+```yml
+- run: rustup update $toolchain && rustup default $toolchain
+  shell: bash
+```

.github/actions/install-rust/README.md

@@ -0,0 +1,12 @@
+name: "Install Rust toolchain"
+description: "Install both `rustup` and a Rust toolchain"
+
+inputs:
+  toolchain:
+    description: "Default toolchain to install"
+    required: false
+    default: "stable"
+
+runs:
+  using: node16
+  main: "main.js"

.github/actions/install-rust/action.yml

@@ -0,0 +1,38 @@
+const child_process = require('child_process');
+const toolchain = process.env.INPUT_TOOLCHAIN;
+const fs = require('fs');
+
+function set_env(name, val) {
+    fs.appendFileSync(process.env['GITHUB_ENV'], `${name}=${val}\n`)
+}
+
+// Needed for now to get 1.24.2 which fixes a bug in 1.24.1 that causes issues
+// on Windows.
+if (process.platform === 'win32') {
+    child_process.execFileSync('rustup', ['self', 'update']);
+}
+
+child_process.execFileSync('rustup', ['set', 'profile', 'minimal']);
+child_process.execFileSync('rustup', ['update', toolchain, '--no-self-update']);
+child_process.execFileSync('rustup', ['default', toolchain]);
+
+// Deny warnings on CI to keep our code warning-free as it lands in-tree. Don't
+// do this on nightly though since there's a fair amount of warning churn there.
+// RUSTIX: Disable this so that it doesn't overwrite RUSTFLAGS for setting
+// "--cfg rustix_use_libc". We re-add it manually in the workflow.
+//if (!toolchain.startsWith('nightly')) {
+//  set_env("RUSTFLAGS", "-D warnings");
+//}
+
+// Save disk space by avoiding incremental compilation, and also we don't use
+// any caching so incremental wouldn't help anyway.
+set_env("CARGO_INCREMENTAL", "0");
+
+// Turn down debuginfo from 2 to 1 to help save disk space
+set_env("CARGO_PROFILE_DEV_DEBUG", "1");
+set_env("CARGO_PROFILE_TEST_DEBUG", "1");
+
+if (process.platform === 'darwin') {
+    set_env("CARGO_PROFILE_DEV_SPLIT_DEBUGINFO", "unpacked");
+    set_env("CARGO_PROFILE_TEST_SPLIT_DEBUGINFO", "unpacked");
+}

.github/actions/install-rust/main.js

@@ -1,45 +1,68 @@
 name: Contract Development
 
-# Pushes to long living branches and all PRs
-on:
-  push:
-    branches:
-      - main
-      - 0.[0-9]+
-  pull_request:
+## Pushes to long living branches and all PRs
+on: [push, pull_request]
+#  push:
+#    branches:
+#      - secret
+#      - 0.[0-9]+
+#  pull_request:
 
 env:
   RUST_BACKTRACE: 1
 
 jobs:
+  test-packages:
+    name: Package Tests for ${{ matrix.build }} ${{ matrix.rust }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        rust: [1.60.0, stable]
+
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v3
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.rust }}
+          target: wasm32-unknown-unknown
+          profile: minimal
+          override: true
+      - name: Build std
+        run: cargo build
+      - name: Test std
+        run: cargo test
+
   test-hackatom:
-    name: ${{ matrix.build }}
+    name: Contract Tests for ${{ matrix.build }} ${{ matrix.rust }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - build: macOS
-            os: macOS-latest
-          - build: Windows
-            os: windows-latest
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        rust: [1.60.0, stable]
+
     defaults:
       run:
         shell: bash
         working-directory: ./contracts/hackatom
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: ./.github/actions/install-rust
         with:
-          toolchain: 1.56.1
-          target: wasm32-unknown-unknown
-          profile: minimal
-          override: true
+          toolchain: ${{ matrix.rust }}
+      - name: Add wasm toolchain
+        run: |
+          rustup target add wasm32-unknown-unknown
+
       - name: Build hackatom wasm
         run: cargo wasm --locked
       - name: Unit Test hackatom
         run: cargo unit-test --locked
-      - name: Integration Test hackatom
-        run: cargo integration-test --locked
+#      - name: Integration Test hackatom
+#        run: cargo integration-test --locked

.github/workflows/ci.yml

@@ -0,0 +1,38 @@
+on: [push, pull_request]
+
+name: Linting
+
+jobs:
+  lints:
+    name: ${{ matrix.make.name }} ${{ matrix.rust }} (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        rust: [1.60.0, stable]
+        make:
+          - name: Clippy
+            task: "cargo clippy"
+
+    env:
+      RUST_BACKTRACE: full
+      RUSTV: ${{ matrix.rust }}
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install Rust
+        uses: ./.github/actions/install-rust
+        with:
+          toolchain: ${{ matrix.rust }}
+      - name: Add wasm toolchain
+        run: |
+          rustup target add wasm32-unknown-unknown
+
+      - name: Install Clippy
+        if: matrix.make.name == 'Clippy'
+        run: |
+          rustup component add clippy
+
+      - name: ${{ matrix.make.name }}
+        run: ${{ matrix.make.task }}

.github/workflows/lint.yml

@@ -9,7 +9,6 @@ pull_request_rules:
       - label!=WIP
       # We need to list them all individually. Here is why: https://doc.mergify.io/conditions.html#validating-all-status-check
       - "status-success=ci/circleci: package_crypto"
-      - "status-success=ci/circleci: package_profiler"
       - "status-success=ci/circleci: package_schema"
       - "status-success=ci/circleci: package_std"
       - "status-success=ci/circleci: package_storage"