CI improvments

Remove unused code/steps
Merge jobs that could be merged together (e.g. jobs used for building could be used for testing afterwards)
Give the jobs nicer `name`s so they don't appear like `some-job` on github UI

.github/workflows/adex-cli.yml

@@ -1,4 +1,4 @@
-name: adex-cli
+name: Adex CLI
 on: [push]
 
 concurrency:
@@ -10,6 +10,7 @@ env:
 
 jobs:
   code-check:
+    name: Code Checks
     timeout-minutes: 60
     runs-on: ${{ matrix.os }}
     strategy:
@@ -18,21 +19,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: pre scripts for ci container
-        run: |
-          git config --global --add safe.directory /__w/komodo-defi-framework/komodo-defi-framework
-          echo "/bin" >> $GITHUB_PATH
-          echo "/usr/bin" >> $GITHUB_PATH
-          echo "/root/.cargo/bin" >> $GITHUB_PATH
-
-      - name: Calculate commit hash for PR commit
-        if: github.event_name == 'pull_request'
-        run: echo "COMMIT_HASH=$(git rev-parse --short=7 ${{ github.event.pull_request.head.sha }})" >> $GITHUB_ENV
-
-      - name: Calculate commit hash for merge commit
-        if: github.event_name != 'pull_request'
-        run: echo "COMMIT_HASH=$(git rev-parse --short=7 HEAD)" >> $GITHUB_ENV
-
       - name: Cargo cache
         uses: ./.github/actions/cargo-cache
 
@@ -41,64 +27,10 @@ jobs:
           cargo fmt --manifest-path ./mm2src/adex_cli/Cargo.toml --all -- --check
           cargo clippy --manifest-path ./mm2src/adex_cli/Cargo.toml --all-targets --all-features -- --D warnings
 
-  test:
-    timeout-minutes: 60
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: pre scripts for ci container
+      - name: Start building
         run: |
-          git config --global --add safe.directory /__w/komodo-defi-framework/komodo-defi-framework
-          echo "/bin" >> $GITHUB_PATH
-          echo "/usr/bin" >> $GITHUB_PATH
-          echo "/root/.cargo/bin" >> $GITHUB_PATH
-
-      - name: Calculate commit hash for PR commit
-        if: github.event_name == 'pull_request'
-        run: echo "COMMIT_HASH=$(git rev-parse --short=7 ${{ github.event.pull_request.head.sha }})" >> $GITHUB_ENV
-
-      - name: Calculate commit hash for merge commit
-        if: github.event_name != 'pull_request'
-        run: echo "COMMIT_HASH=$(git rev-parse --short=7 HEAD)" >> $GITHUB_ENV
-
-      - name: Cargo cache
-        uses: ./.github/actions/cargo-cache
+          cargo build --manifest-path ./mm2src/adex_cli/Cargo.toml
 
       - name: Start testing
         run: |
           cargo test --manifest-path ./mm2src/adex_cli/Cargo.toml --no-fail-fast
-
-  build:
-    timeout-minutes: 60
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: pre scripts for ci container
-        run: |
-          git config --global --add safe.directory /__w/komodo-defi-framework/komodo-defi-framework
-          echo "/bin" >> $GITHUB_PATH
-          echo "/usr/bin" >> $GITHUB_PATH
-          echo "/root/.cargo/bin" >> $GITHUB_PATH
-
-      - name: Calculate commit hash for PR commit
-        if: github.event_name == 'pull_request'
-        run: echo "COMMIT_HASH=$(git rev-parse --short=7 ${{ github.event.pull_request.head.sha }})" >> $GITHUB_ENV
-
-      - name: Calculate commit hash for merge commit
-        if: github.event_name != 'pull_request'
-        run: echo "COMMIT_HASH=$(git rev-parse --short=7 HEAD)" >> $GITHUB_ENV
-
-      - name: Cargo cache
-        uses: ./.github/actions/cargo-cache
-
-      - name: Start building
-        run: |
-          cargo build --manifest-path ./mm2src/adex_cli/Cargo.toml

.github/workflows/dev-build.yml

@@ -12,6 +12,7 @@ env:
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
   MANUAL_MM_VERSION: true
   JEMALLOC_SYS_WITH_MALLOC_CONF: "background_thread:true,narenas:1,tcache:false,dirty_decay_ms:0,muzzy_decay_ms:0,metadata_thp:auto"
+  FILE_SERVER_AVAILABLE: ${{ secrets.FILE_SERVER_KEY != '' }}
 
 jobs:
   linux-x86-64:
@@ -51,19 +52,15 @@ jobs:
           cargo build --bin mm2 --release
 
       - name: Compress build output
-        env:
-          AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
-        if: ${{ env.AVAILABLE != '' }}
+        if: env.FILE_SERVER_AVAILABLE
         run: |
           NAME="mm2_$COMMIT_HASH-linux-x86-64.zip"
           zip $NAME target/release/mm2 -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
       - name: Upload output
-        env:
-          AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
-        if: ${{ env.AVAILABLE != '' }}
+        if: env.FILE_SERVER_AVAILABLE
         uses: garygrossgarten/github-action-scp@v0.8.0
         with:
           host: ${{ secrets.FILE_SERVER_HOST }}

.github/workflows/fmt-and-lint.yml

@@ -7,6 +7,7 @@ concurrency:
 
 jobs:
   fmt-and-lint:
+    name: Style Checks
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
     strategy:
@@ -20,21 +21,24 @@ jobs:
           rustup default nightly-2022-10-29
 
       - name: Install OS dependencies
+        if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get update 
           sudo apt-get -y install libudev-dev
-        if: matrix.os == 'ubuntu-latest'
 
       - name: Cargo cache
         uses: ./.github/actions/cargo-cache
 
       - name: fmt check
+        # Format checks aren't OS dependant.
+        if: matrix.os == 'ubuntu-latest'
         run: cargo fmt -- --check
 
-      - name: x86-64 code lint
+      - name: clippy lint
         run: cargo clippy --all-targets --all-features -- --D warnings
 
   wasm-lint:
+    name: Style Checks
     timeout-minutes: 45
     runs-on: ubuntu-latest
     steps:
@@ -48,5 +52,5 @@ jobs:
       - name: Cargo cache
         uses: ./.github/actions/cargo-cache
 
-      - name: wasm code lint
+      - name: clippy lint
         run: cargo clippy --target wasm32-unknown-unknown -- --D warnings

.github/workflows/pr-lint.yml

@@ -1,4 +1,4 @@
-name: "PR Lint"
+name: PR Lint
 
 on:
   pull_request:
@@ -45,11 +45,9 @@ jobs:
           fi
 
       - name: Check PR labels
-        if: >
-          (contains(toJson(github.event.pull_request.labels.*.name), 'under review') == false &&
-          contains(toJson(github.event.pull_request.labels.*.name), 'in progress') == false) ||
-          (contains(toJson(github.event.pull_request.labels.*.name), 'under review') == true &&
-          contains(toJson(github.event.pull_request.labels.*.name), 'in progress') == true)
+        env:
+          LABEL_NAMES: ${{ toJson(github.event.pull_request.labels.*.name) }}
+        if: contains(env.LABEL_NAMES, 'under review') == contains(env.LABEL_NAMES, 'in progress')
         run: |
-          echo "PR must have "exactly one" of these labels: [ 'under review', 'in progress' ]."
+          echo "PR must have "exactly one" of these labels: ['under review', 'in progress']."
           exit 1

.github/workflows/test.yml

@@ -1,5 +1,8 @@
 name: Test
-on: [push]
+on:
+  push:
+    branches-ignore:
+      - main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -121,27 +124,28 @@ jobs:
           wget -O - https://raw.githubusercontent.com/KomodoPlatform/komodo/master/zcutil/fetch-params-alt.sh | bash
           cargo test --test 'mm2_tests_main' --no-fail-fast
 
-  # https://docs.github.com/en/actions/learn-github-actions/usage-limits-billing-and-administration#usage-limits
-  # https://github.com/KomodoPlatform/atomicDEX-API/actions/runs/4419618128/jobs/7748266141#step:4:1790
-  # mac-x86-64-mm2-integration:
-  #   timeout-minutes: 90
-  #   runs-on: macos-latest
-  #   env:
-  #     BOB_PASSPHRASE: ${{ secrets.BOB_PASSPHRASE_MACOS }}
-  #     BOB_USERPASS: ${{ secrets.BOB_USERPASS_MACOS }}
-  #     ALICE_PASSPHRASE: ${{ secrets.ALICE_PASSPHRASE_MACOS }}
-  #     ALICE_USERPASS: ${{ secrets.ALICE_USERPASS_MACOS }}
-  #     TELEGRAM_API_KEY: ${{ secrets.TELEGRAM_API_KEY }}
-  #   steps:
-  #   - uses: actions/checkout@v3
-  #   - name: Install toolchain
-  #     run: |
-  #       rustup toolchain install nightly-2022-10-29 --no-self-update --profile=minimal
-  #       rustup default nightly-2022-10-29
-  #       rustup target add x86_64-apple-darwin
-
-  #   - name: Test
-  #     run: cargo test --test 'mm2_tests_main' --target x86_64-apple-darwin
+  mac-x86-64-mm2-integration:
+    timeout-minutes: 90
+    runs-on: macos-latest
+    env:
+      BOB_PASSPHRASE: ${{ secrets.BOB_PASSPHRASE_MACOS }}
+      BOB_USERPASS: ${{ secrets.BOB_USERPASS_MACOS }}
+      ALICE_PASSPHRASE: ${{ secrets.ALICE_PASSPHRASE_MACOS }}
+      ALICE_USERPASS: ${{ secrets.ALICE_USERPASS_MACOS }}
+      TELEGRAM_API_KEY: ${{ secrets.TELEGRAM_API_KEY }}
+    steps:
+    - uses: actions/checkout@v3
+    - name: Install toolchain
+      run: |
+        rustup toolchain install nightly-2022-10-29 --no-self-update --profile=minimal
+        rustup default nightly-2022-10-29
+        rustup target add x86_64-apple-darwin
+
+    - name: Cargo cache
+      uses: ./.github/actions/cargo-cache
+
+    - name: Test
+      run: cargo test --test 'mm2_tests_main' --no-fail-fast --target x86_64-apple-darwin
 
   win-x86-64-mm2-integration:
     timeout-minutes: 90