ci: add tor script to binaries bundle

tari-project · Jan 10, 2022 · 176daba · 176daba
1 parent bc9ede1
commit 176daba
Showing 1 changed file with 7 additions and 32 deletions.
diff --git a/.github/workflows/base_node_binaries.yml b/.github/workflows/base_node_binaries.yml
@@ -17,7 +17,6 @@ on:
 
 env:
   TBN_FILENAME: "tari_base_node"
-#  PROTOC: protoc
 
 jobs:
   builds:
@@ -95,7 +94,6 @@ jobs:
             libappindicator3-dev \
             patchelf \
             librsvg2-dev
-      #        sudo apt-get -y upgrade
       - name: Install macOS dependencies
         if: startsWith(runner.os,'macOS')
         run: brew install cmake zip coreutils
@@ -133,7 +131,7 @@ jobs:
           echo "LIBCLANG_PATH=C:\Program Files\LLVM\bin" >> $GITHUB_ENV
           echo "C:\Strawberry\perl\bin" >> $GITHUB_PATH
 
-      - name: Caching
+      - name: Cache cargo files and outputs
         uses: actions/cache@v2
         with:
           path: |
@@ -142,50 +140,27 @@ jobs:
             target
           key: ${{ runner.os }}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
 
-      - name: Compile NPM
+      - name: Compile launchpad GUI
         run: |
             cd applications/launchpad/gui-vue
             npm install
             npm run build
 
-      - name: Compile react (collectibles)
+      - name: Compile collectibles GUI
         run: |
           cd applications/tari_collectibles/web-app
           npm install
           npm run build
 
-      - name: Build binaries
+      - name: Build rust binaries
         env:
           RUSTFLAGS: "-C target_cpu=${{ matrix.target_cpu }}"
           ROARING_ARCH: "${{ matrix.target_cpu }}"
         run: |
           echo "Cache Key: ${{ runner.os }}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}"
-          #cd applications/tari_base_node
-          #cargo build --release --bin tari_base_node --features ${{ matrix.features}}
           cargo build --release
 
-#      - name: Build tauri apps
-#        env:
-#          RUSTFLAGS: "-C target_cpu=${{ matrix.target_cpu }}"
-#        run: |
-#          echo "Cache Key: ${{ runner.os }}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}"
-#          cd applications/tari_collectibles
-#          npm install
-#          cd web-app
-#          npm install
-#          cd ..
-#          npm run tauri build
-
-      #  - name: Prepare Archives
-        #  - name: Prepare Archives
-        #    shell: bash
-        #    run: |
-        #      ls -la "$GITHUB_WORKSPACE"
-        #      mkdir -p "$GITHUB_WORKSPACE${TBN_DIST}/archives"
-        #      export distDir="$GITHUB_WORKSPACE${TBN_DIST}/archives"
-        #      "$GITHUB_WORKSPACE/scripts/build_dists_tarball.sh" noBuild
-
-      - name: Prepare binaries
+      - name: Copy binaries to folder for zipping
         shell: bash
         run: |
           mkdir -p "$GITHUB_WORKSPACE${TBN_DIST}"
@@ -195,18 +170,18 @@ jobs:
           echo "Sha: ${VSHA_SHORT}"
           echo "VERSION=${VERSION}" >> $GITHUB_ENV
           echo "VSHA_SHORT=${VSHA_SHORT}" >> $GITHUB_ENV
-          #BINFILE="${TBN_FILENAME}-${VERSION}-${VSHA_SHORT}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}${TBN_EXT}"
           BINFILE="${TBN_FILENAME}-${VERSION}-${VSHA_SHORT}-${{ matrix.os }}-${{ matrix.target_cpu }}${TBN_EXT}"
           echo "BINFILE=${BINFILE}" >> $GITHUB_ENV
           echo "Copying files for ${BINFILE} to $(pwd)"
-          #cp -v "$GITHUB_WORKSPACE/target/release/${TBN_FILENAME}${TBN_EXT}" "./${BINFILE}"
           ls -la "$GITHUB_WORKSPACE/target/release/"
           cp -v "$GITHUB_WORKSPACE/target/release/tari_base_node${TBN_EXT}" .
           cp -v "$GITHUB_WORKSPACE/target/release/tari_console_wallet${TBN_EXT}" .
           cp -v "$GITHUB_WORKSPACE/target/release/tari_merge_mining_proxy${TBN_EXT}" .
           cp -v "$GITHUB_WORKSPACE/target/release/tari_mining_node${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/launchpad${TBN_EXT}" .
+          cp -v "$GITHUB_WORKSPACE/applications/tari_base_node/${{ runner.os ,, }}/runtime/start_tor.*" .
 
       - name: Build the macos pkg
         if: startsWith(runner.os,'macOS')