Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port v0.10 test contract to v1 #944

Merged
merged 14 commits into from
Jul 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push]

jobs:
Enclave-Unit-Tests:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Install Intel's SGX SDK
Expand Down Expand Up @@ -35,7 +35,7 @@ jobs:
run: |
cargo --version
rustc --version
cargo +stable install xargo
cargo +stable install xargo --version 0.3.25
xargo --version
- name: Download sccache
run: |
Expand All @@ -51,7 +51,7 @@ jobs:
make clean-enclave

Build:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
run: |
cargo --version
rustc --version
cargo +stable install xargo
cargo +stable install xargo --version 0.3.25
xargo --version
- name: Download sccache
run: |
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
path: ./x/compute/internal/keeper/testdata/test-contract/static-too-high-initial-memory.wasm

Go-Tests:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
needs: Build
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -208,7 +208,7 @@ jobs:
LOG_LEVEL=ERROR go test -p 1 -timeout 20m -v ./x/compute/internal/...

Clippy:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Install Intel's SGX SDK
Expand Down Expand Up @@ -239,7 +239,7 @@ jobs:
run: |
cargo --version
rustc --version
cargo +stable install xargo
cargo +stable install xargo --version 0.3.25
xargo --version
- name: Download sccache
run: |
Expand All @@ -255,7 +255,7 @@ jobs:
SGX_MODE=HW make clippy

XBuild-CLI:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
Expand All @@ -271,7 +271,7 @@ jobs:
run: make build_windows_cli

Integration-Tests:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Build docker testnet
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
db_backend: [rocksdb, goleveldb]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
env: # Or as an environment variable
SPID_TESTNET: ${{ secrets.SPID_TESTNET }}
API_KEY_TESTNET: ${{ secrets.API_KEY_TESTNET }}
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
- run: rustup component add rust-src clippy
- name: Install xargo
run: |
cargo +stable install xargo
cargo +stable install xargo --version 0.3.25
xargo --version
- name: Download sccache
run: |
Expand All @@ -80,7 +80,7 @@ jobs:
path: secretnetwork_${{ steps.get_version.outputs.VERSION }}_testnet_${{ matrix.db_backend }}_amd64.deb

build-deb-mainnet:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
runs-on: ${{matrix.os}}
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
os: [ubuntu-20.04, windows-latest, macos-latest]
steps:
- uses: actions/checkout@v3
- name: Build CLI
Expand All @@ -139,7 +139,7 @@ jobs:
path: secretcli-${{runner.os}}

x-build-cli:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v2
Expand All @@ -160,7 +160,7 @@ jobs:
path: secretcli-MacOS-arm64

publish-localsecret:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
env:
REGISTRY: ghcr.io
IMAGE_NAME: scrtlabs/localsecret
Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:

Release:
needs: [native-build-cli, build-deb-testnet, build-deb-mainnet, x-build-cli]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- name: Get the version
Expand Down
14 changes: 9 additions & 5 deletions deployment/ci/docker-compose.ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3'

services:
aesm:
image: enigmampc/aesm
image: fortanix/aesmd:2.13.103.1-1
devices:
- /dev/sgx/enclave
- /dev/sgx/provision
Expand All @@ -20,8 +20,9 @@ services:
- aesm
devices:
- /dev/sgx/enclave
- /dev/sgx/provision
volumes:
- /var/run/aesmd:/var/run/aesmd
- /tmp/aesmd:/var/run/aesmd
- /tmp/secretd:/root/.secretd
- /tmp/secretcli:/root/.secretcli
stdin_open: true
Expand All @@ -39,8 +40,9 @@ services:
- aesm
devices:
- /dev/sgx/enclave
- /dev/sgx/provision
volumes:
- /var/run/aesmd:/var/run/aesmd
- /tmp/aesmd:/var/run/aesmd
- /tmp/secretd:/root/.secretd
# - /tmp/secretcli:/root/.secretcli
stdin_open: true
Expand All @@ -58,8 +60,9 @@ services:
- bootstrap
devices:
- /dev/sgx/enclave
- /dev/sgx/provision
volumes:
- /var/run/aesmd:/var/run/aesmd
- /tmp/aesmd:/var/run/aesmd
- /tmp/secretd:/tmp/.secretd
# - /tmp/secretcli:/root/.secretcli
stdin_open: true
Expand All @@ -74,8 +77,9 @@ services:
- aesm
devices:
- /dev/sgx/enclave
- /dev/sgx/provision
volumes:
- /var/run/aesmd:/var/run/aesmd
- /tmp/aesmd:/var/run/aesmd
- /tmp/secretd:/tmp/.secretd
- /tmp/secretcli:/root/.secretcli
stdin_open: true
Expand Down
Loading