diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b0f98744e..daccc9bf7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,11 +12,11 @@ on: push: tags: - 'v*-pre.*' - - '*-force-build*' + - '*.dev-build.*' jobs: macos-x64: - runs-on: [self-hosted, macOS, X64] + runs-on: [self-hosted, macOS, X64, cargo] permissions: contents: write strategy: @@ -53,18 +53,14 @@ jobs: - name: Cargo Build run: | - export PATH="/usr/local/opt/openssl@3/bin:$PATH" - export LDFLAGS="-L/usr/local/opt/openssl@3/lib" - export CPPFLAGS="-I/usr/local/opt/openssl@3/include" - export PKG_CONFIG_PATH="/usr/local/opt/openssl@3/lib/pkgconfig" cargo build --release - name: Copy binaries to cache folder run: | mkdir -pv build_artifacts/${{ matrix.network }}/bin cp /var/tmp/*.css build_artifacts/${{ matrix.network }} - cp target/release/full-service build_artifacts/${{ matrix.network }}/bin/ - cp target/release/transaction-signer build_artifacts/${{ matrix.network }}/bin/ + cp target/release/mc-full-service build_artifacts/${{ matrix.network }}/bin/ + cp target/release/mc-transaction-signer build_artifacts/${{ matrix.network }}/bin/ cp target/release/mc-validator-service build_artifacts/${{ matrix.network }}/bin/ - name: Create Artifact @@ -78,13 +74,13 @@ jobs: name: full-service_${{ runner.os }}_${{ matrix.network }}_x86 path: artifact/${{ github.sha }}-${{ runner.os }}-x86-${{ matrix.network }}.tar.gz - - name: Create Release + - name: Create Prerelease if: startsWith(github.ref, 'refs/tags/v') run: | mkdir -pv release cd release && tar -czvf ${{ github.ref_name }}-${{ runner.os }}-x86-${{ matrix.network }}.tar.gz -C ../build_artifacts/${{ matrix.network }}/ . - - name: Upload Release + - name: Upload Prerelease if: startsWith(github.ref, 'refs/tags/v') uses: softprops/action-gh-release@v1 with: @@ -94,7 +90,7 @@ jobs: release/${{ github.ref_name }}-${{ runner.os }}-x86-${{ matrix.network }}.tar.gz macos-arm64: - runs-on: [self-hosted, macOS, ARM64] + runs-on: [self-hosted, macOS, ARM64, cargo] permissions: contents: write strategy: @@ -131,18 +127,14 @@ jobs: - name: Cargo Build run: | - export PATH="/opt/homebrew/opt/openssl@3/bin:$PATH" - export LDFLAGS="-L/opt/homebrew/opt/openssl@3/lib" - export CPPFLAGS="-I/opt/homebrew/opt/openssl@3/include" - export PKG_CONFIG_PATH="/opt/homebrew/opt/openssl@3/lib/pkgconfig" cargo build --release - name: Copy binaries to cache folder run: | mkdir -pv build_artifacts/${{ matrix.network }}/bin cp /var/tmp/*.css build_artifacts/${{ matrix.network }} - cp target/release/full-service build_artifacts/${{ matrix.network }}/bin/ - cp target/release/transaction-signer build_artifacts/${{ matrix.network }}/bin/ + cp target/release/mc-full-service build_artifacts/${{ matrix.network }}/bin/ + cp target/release/mc-transaction-signer build_artifacts/${{ matrix.network }}/bin/ cp target/release/mc-validator-service build_artifacts/${{ matrix.network }}/bin/ - name: Create Artifact @@ -156,13 +148,13 @@ jobs: name: full-service_${{ runner.os }}_${{ matrix.network }}_arm64 path: artifact/${{ github.sha }}-${{ runner.os }}-arm64-${{ matrix.network }}.tar.gz - - name: Create Release + - name: Create Prerelease if: startsWith(github.ref, 'refs/tags/v') run: | mkdir -pv release cd release && tar -czvf ${{ github.ref_name }}-${{ runner.os }}-arm64-${{ matrix.network }}.tar.gz -C ../build_artifacts/${{ matrix.network }}/ . - - name: Upload Release + - name: Upload Prerelease if: startsWith(github.ref, 'refs/tags/v') uses: softprops/action-gh-release@v1 with: @@ -209,8 +201,8 @@ jobs: run: | mkdir -pv build_artifacts/${{ matrix.network }}/bin cp /var/tmp/*.css build_artifacts/${{ matrix.network }} - cp target/release/full-service build_artifacts/${{ matrix.network }}/bin/ - cp target/release/transaction-signer build_artifacts/${{ matrix.network }}/bin/ + cp target/release/mc-full-service build_artifacts/${{ matrix.network }}/bin/ + cp target/release/mc-transaction-signer build_artifacts/${{ matrix.network }}/bin/ cp target/release/mc-validator-service build_artifacts/${{ matrix.network }}/bin/ - name: Create Artifact @@ -224,13 +216,13 @@ jobs: name: full-service_${{ runner.os }}_${{ matrix.network }} path: artifact/${{ github.sha }}-${{ runner.os }}-${{ matrix.network }}.tar.gz - - name: Create Release + - name: Create Prerelease if: startsWith(github.ref, 'refs/tags/v') run: | mkdir -pv release cd release && tar -czvf ${{ github.ref_name }}-${{ runner.os }}-${{ matrix.network }}.tar.gz -C ../build_artifacts/${{ matrix.network }}/ . - - name: Upload Release + - name: Upload Prerelease if: startsWith(github.ref, 'refs/tags/v') uses: softprops/action-gh-release@v1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index db7733872..4d4ae4402 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,6 @@ on: tags: - 'v*' - '!v*-pre*' - - '*-force-release*' jobs: release: diff --git a/README.md b/README.md index 8c19d2c70..76519e7a5 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,7 @@ sudo xcode-select -s /Applications/.app/Contents/Deve ```sh mkdir -p /tmp/wallet-db/ - ./target/release/full-service \ + ./target/release/mc-full-service \ --wallet-db /tmp/wallet-db/wallet.db \ --ledger-db /tmp/ledger-db/ \ --peer mc://node1.test.mobilecoin.com/ \ @@ -278,7 +278,7 @@ The recommended flow to get balance and submit transaction is the following: 1. *ONLINE MACHINE*: Sync ledger by running full service. ```sh - ./target/release/full-service \ + ./target/release/mc-full-service \ --wallet-db /tmp/wallet-db/wallet.db \ --ledger-db /tmp/ledger-db/ \ --peer mc://node1.test.mobilecoin.com/ \ @@ -292,7 +292,7 @@ The recommended flow to get balance and submit transaction is the following: ```sh cp -r /tmp/ledger-db /media/ - cp ./target/release/full-service /media/ + cp ./target/release/mc-full-service /media/ ``` 1. *OFFLINE MACHINE*: Create a ramdisk to store sensitive material. @@ -318,13 +318,13 @@ The recommended flow to get balance and submit transaction is the following: ```sh cp /media/ledger-db /keyfs/ledger-db - cp /media/full-service /keyfs/full-service + cp /media/mc-full-service /keyfs/mc-full-service ``` 1. *OFFLINE MACHINE*: Run full service in offline mode. ```sh - ./target/release/full-service \ + ./target/release/mc-full-service \ --wallet-db /keyfs/wallet.db \ --ledger-db /keyfs/ledger-db/ \ --offline \ diff --git a/docs/tutorials/environment-setup.md b/docs/tutorials/environment-setup.md index 4d930853e..2c5a6d649 100644 --- a/docs/tutorials/environment-setup.md +++ b/docs/tutorials/environment-setup.md @@ -20,7 +20,7 @@ description: Set up your environment to run full service on Mac or Linux. ```text mkdir -p testnet-dbs - RUST_LOG=info,mc_connection=info,mc_ledger_sync=info ./full-service \ + RUST_LOG=info,mc_connection=info,mc_ledger_sync=info ./mc-full-service \ --wallet-db ./testnet-dbs/wallet.db \ --ledger-db ./testnet-dbs/ledger-db/ \ --peer mc://node1.test.mobilecoin.com/ \ @@ -35,7 +35,7 @@ description: Set up your environment to run full service on Mac or Linux. ```text mkdir -p mainnet-dbs - RUST_LOG=info,mc_connection=info,mc_ledger_sync=info ./full-service \ + RUST_LOG=info,mc_connection=info,mc_ledger_sync=info ./mc-full-service \ --wallet-db ./mainnet-dbs/wallet.db \ --ledger-db ./mainnet-dbs/ledger-db/ \ --peer mc://node1.prod.mobilecoinww.com/ \ diff --git a/full-service/Cargo.toml b/full-service/Cargo.toml index 6cc51605a..179ea3bb1 100644 --- a/full-service/Cargo.toml +++ b/full-service/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" build = "build.rs" [[bin]] -name = "full-service" +name = "mc-full-service" path = "src/bin/main.rs" [dependencies]