Skip to content

Commit

Permalink
Merge branch 'testnet-dibbler' into dibbler-merge
Browse files Browse the repository at this point in the history
* testnet-dibbler: (29 commits)
  refactor(launchpad): move launchpad to its own repo (tari-project#4323)
  feat: tari launchpad downstream merge (tari-project#4322)
  feat: bump toolchain for GHA from nightly-2021-11-20 to nightly-2022-05-01 (tari-project#4308)
  fix: fix OSX GHA build fix by bumping OSX release (tari-project#4300)
  v0.32.12
  fix: cbindgen fix (tari-project#4298)
  v0.32.11
  chore: wallet ffi refactor (tari-project#4295)
  fix: fixed bug in wallet_coin_join (tari-project#4290)
  v0.32.10
  feat(wallet_ffi): added mined_timestamp to TariUtxo (tari-project#4284)
  fix: removed code duplication in TariUtxo conversion (tari-project#4283)
  fix: improve GHA docker image builds (tari-project#4257)
  feat: add mined_timestamp to wallet.db (tari-project#4267)
  chore(deps): docker gha builds (tari-project#4274)
  chore(deps): improve xmrig docker builds (tari-project#4273)
  v0.32.9
  feat(ffi): added 3 functions (tari-project#4266)
  ffi: added 2 functions, wallet_preview_coin_split and wallet_preview_coin_join (tari-project#4264)
  v0.32.8
  ...
  • Loading branch information
sdbondi committed Jul 22, 2022
2 parents 5e3797f + cd15cee commit 49757c2
Show file tree
Hide file tree
Showing 177 changed files with 3,636 additions and 27,016 deletions.
2 changes: 0 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,9 @@ workflows:
branches:
ignore:
gh-pages
launchpad_such_wow # TODO: Remove this filter once the branch is merged into development
- run-ffi-integration-tests:
filters:
branches:
ignore:
gh-pages
launchpad_such_wow # TODO: Remove this filter once the branch is merged into development

4 changes: 0 additions & 4 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,3 @@ base_layer/wallet_ffi/build.config
base_layer/wallet_ffi/.cargo/config

keys.json

# Ignore docker files
applications/launchpad/docker_rig/*.Dockerfile
applications/launchpad/docker_rig/docker-compose.yml
1 change: 1 addition & 0 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
# Runs daily
---
name: Security audit

on:
Expand Down
10 changes: 1 addition & 9 deletions .github/workflows/base_node_binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
run: |
echo "SHARUN=shasum --algorithm 256" >> $GITHUB_ENV
echo "CC=gcc" >> $GITHUB_ENV
echo "TBN_EXT=" >> $GITHUB_ENV
echo "TBN_EXT=" >> $GITHUB_ENV
echo "LIB_PRE=lib" >> $GITHUB_ENV
echo "SHELL_EXT=.sh" >> $GITHUB_ENV
echo "PLATFORM_SPECIFIC_DIR=linux" >> $GITHUB_ENV
Expand Down Expand Up @@ -149,12 +149,6 @@ jobs:
- name: Cache cargo files and outputs
uses: Swatinem/rust-cache@v1

- name: Compile launchpad GUI
run: |
cd applications/launchpad/gui-vue
npm install
npm run build
- name: Compile collectibles GUI
run: |
cd applications/tari_collectibles/web-app
Expand Down Expand Up @@ -200,7 +194,6 @@ jobs:
cp -v "$GITHUB_WORKSPACE/target/release/tari_miner${TBN_EXT}" .
cp -v "$GITHUB_WORKSPACE/target/release/tari_validator_node${TBN_EXT}" .
cp -v "$GITHUB_WORKSPACE/target/release/tari_collectibles${TBN_EXT}" .
cp -v "$GITHUB_WORKSPACE/target/release/tari_launchpad${TBN_EXT}" .
cp -v "$GITHUB_WORKSPACE/target/release/${LIB_PRE}tari_mining_helper_ffi${LIB_EXT}" .
cp -v "$GITHUB_WORKSPACE/applications/tari_base_node/${PLATFORM_SPECIFIC_DIR}/runtime/start_tor${SHELL_EXT}" .
Expand Down Expand Up @@ -236,7 +229,6 @@ jobs:
"tari_merge_mining_proxy"
"tari_validator_node"
"tari_collectibles"
"tari_launchpad"
)
for FILE in "${FILES[@]}"; do
codesign --options runtime --force --verify --verbose --timestamp --sign "Developer ID Application: $MACOS_APPLICATION_ID" "/tmp/tari_testnet/runtime/$FILE"
Expand Down
12 changes: 1 addition & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ on:
- main
- ci-*
pull_request:
branches-ignore:
- 'launchpad_such_wow' # TODO: Remove this filter once the branch is merged into development
types:
- opened
- reopened
Expand Down Expand Up @@ -150,15 +148,7 @@ jobs:
runs-on: [ ubuntu-20.04 ]
steps:
- name: checkout
uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
- name: build launchpad gui-vue
run: |
cd applications/launchpad/gui-vue
npm ci
npm run build
uses: actions/checkout@v2
- name: build collectibles web-app
run: |
cd applications/tari_collectibles/web-app
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ on:
- development
- ci-coverage-*

env:
toolchain: nightly-2022-05-01

jobs:
coverage:
name: test and generate cov
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/development-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- main

env:
toolchain: nightly-022-05-01
toolchain: nightly-2022-05-01
CARGO_HTTP_MULTIPLEXING: false
CARGO_TERM_COLOR: always
PROTOC: protoc
Expand All @@ -20,10 +20,6 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v2
- name: npm audit launchpad gui
run: |
cd applications/launchpad/gui-vue
npm audit
- name: npm audit collectibles
run: |
cd applications/tari_collectibles/web-app
Expand Down
152 changes: 0 additions & 152 deletions .github/workflows/launchpad_docker.yml

This file was deleted.

1 change: 1 addition & 0 deletions .github/workflows/libwallet.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
# Build a new set of libraries when a new tag containing 'libwallet' is pushed
---
name: Build libwallet

on:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/long_running.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
# Runs weekly (saturday noon)
---
name: Long running integration tests

on:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/non_critical_integration_tests.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
# Runs daily (2am)
---
name: Non critical integration tests

on:
Expand Down
1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ members = [
"infrastructure/tari_script",
"infrastructure/test_utils",
"applications/deps_only",
"applications/launchpad/backend",
"applications/tari_base_node",
"applications/tari_console_wallet",
"applications/tari_collectibles/src-tauri",
Expand Down
3 changes: 0 additions & 3 deletions applications/launchpad/.dockerignore

This file was deleted.

23 changes: 0 additions & 23 deletions applications/launchpad/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion applications/launchpad/.nvmrc

This file was deleted.

4 changes: 0 additions & 4 deletions applications/launchpad/backend/.gitignore

This file was deleted.

40 changes: 0 additions & 40 deletions applications/launchpad/backend/Cargo.toml

This file was deleted.

Loading

0 comments on commit 49757c2

Please sign in to comment.