Revert "Gh v2 580b czarte and Dan (#630)"

This reverts commit 949dd70.

Author: czarte

.githooks/pre-commit

@@ -20,7 +20,7 @@ jobs:
     name: Build node on ${{ matrix.target.os }}
     runs-on: ${{ matrix.target.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
@@ -36,8 +36,7 @@ jobs:
           toolchain: 1.63.0
           components: rustfmt, clippy
           override: true
-
-      - uses: actions/cache@v4
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/bin/
@@ -46,13 +45,10 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-cargo-
+          key: ${{ runner.os }}-cargo
 
       - name: Build ${{ matrix.target.os }}
         run: |
-          git fetch
           ./ci/all.sh
           ./ci/multinode_integration_test.sh
           ./ci/collect_results.sh
@@ -70,52 +66,46 @@ jobs:
           df -h /Users/runner/work/Node/Node/node/target/release
   deploy_to_s3:
     needs: build
-    if: success() && (startsWith(github.head_ref, 'GH') || startsWith(github.head_ref, 'v'))
     strategy:
       matrix:
-        os: [linux, macos, windows]
-    runs-on: ubuntu-latest
+          os: [linux, macos, windows]
+    runs-on: ubuntu-22.04
     steps:
-        - uses: actions/checkout@v4
+        - uses: actions/checkout@v3
           with:
             ref: ${{ github.event.pull_request.head.sha }}
-            fetch-depth: 1
 
         - name: Download artifacts
           uses: actions/download-artifact@v4
 
         - name: Display structure of downloaded files
           run: ls -R
 
-        - name: Check artifacts exist
-          run: |
-            if [ ! -d "Node-${{ matrix.os }}/generated/bin/" ]; then
-              echo "Error: Build artifacts not found"
-              exit 1
-            fi
-
-        - name: Configure AWS Credentials
-          uses: aws-actions/configure-aws-credentials@v4
-          with:
-            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-            aws-region: us-west-2
-
         - if: startsWith(github.head_ref, 'GH')
           name: Versioned S3 Sync
-          run: |
-            aws s3 sync "Node-${{ matrix.os }}/generated/bin/" "s3://${{ secrets.AWS_S3_BUCKET }}/Node/${{ github.head_ref }}/Node-${{ matrix.os }}" \
-              --delete \
-              --no-progress \
-              --acl private
+          uses: jakejarvis/s3-sync-action@v0.5.1
+          with:
+           args: --acl private --follow-symlinks --delete
+          env:
+            AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
+            AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+            AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            AWS_REGION: 'us-west-2'
+            DEST_DIR: 'Node/${{ github.head_ref }}/Node-${{ matrix.os }}'
+            SOURCE_DIR: 'Node-${{ matrix.os }}/generated/bin/'
 
         - if: startsWith(github.head_ref, 'v')
           name: Latest S3 Sync
-          run: |
-            aws s3 sync "Node-${{ matrix.os }}/generated/bin/" "s3://${{ secrets.AWS_S3_BUCKET }}/Node/latest/Node-${{ matrix.os }}" \
-              --delete \
-              --no-progress \
-              --acl private
+          uses: jakejarvis/s3-sync-action@v0.5.1
+          with:
+           args: --acl private --follow-symlinks --delete
+          env:
+            AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
+            AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+            AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            AWS_REGION: 'us-west-2'
+            DEST_DIR: 'Node/latest/Node-${{ matrix.os }}'
+            SOURCE_DIR: 'Node-${{ matrix.os }}/generated/bin/'
 
         - name: Invalidate Binaries CloudFront
           uses: chetan/invalidate-cloudfront-action@v2.4

.github/workflows/ci-matrix.yml

@@ -1,19 +1,12 @@
 #!/bin/bash -xev
 # Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
 CI_DIR="$( cd "$( dirname "$0" )" && pwd )"
-export ARGV_1="$1"
+PARENT_DIR="$1"
 
 ci/format.sh
 
 export RUST_BACKTRACE=1
-#if github checkout fails, you can download csv database from db-ip.com and convert it locally by cargo run ip_country
-if [[ $GITHUB_ACTIONS || "$ARGV_1" == "dbip" ]]; then
-  git checkout origin/generated-source -- ip_country/src/dbip_country.rs
-  ls -la ip_country/src/dbip_country.rs
-fi
-if [[ -z "${GITHUB_ACTIONS}" ]]; then
-  bash ./install-hooks.sh
-fi
+
 # Remove these two lines to slow down the build
 which sccache || cargo install --version 0.4.1 sccache || echo "Skipping sccache installation"  # Should do significant work only once
 #export CARGO_TARGET_DIR="$CI_DIR/../cargo-cache"
@@ -25,19 +18,19 @@ export RUSTFLAGS="-D warnings -Anon-snake-case"
 echo "*********************************************************************************************************"
 echo "***                                             MASQ_LIB HEAD                                         ***"
 cd "$CI_DIR/../masq_lib"
-ci/all.sh
+ci/all.sh "$PARENT_DIR"
 echo "***                                             MASQ_LIB TAIL                                         ***"
 echo "*********************************************************************************************************"
 echo "*********************************************************************************************************"
 echo "***                                               NODE HEAD                                           ***"
 cd "$CI_DIR/../node"
-ci/all.sh
+ci/all.sh "$PARENT_DIR"
 echo "***                                               NODE TAIL                                           ***"
 echo "*********************************************************************************************************"
 echo "*********************************************************************************************************"
 echo "***                                           DNS UTILITY HEAD                                        ***"
 cd "$CI_DIR/../dns_utility"
-ci/all.sh
+ci/all.sh "$PARENT_DIR"
 echo "***                                           DNS UTILITY TAIL                                        ***"
 echo "*********************************************************************************************************"
 echo "*********************************************************************************************************"
@@ -49,12 +42,13 @@ echo "**************************************************************************
 echo "*********************************************************************************************************"
 echo "***                                             AUTOMAP HEAD                                          ***"
 cd "$CI_DIR/../automap"
-ci/all.sh
+ci/all.sh "$PARENT_DIR"
 echo "***                                             AUTOMAP TAIL                                          ***"
 echo "*********************************************************************************************************"
 echo "*********************************************************************************************************"
 echo "***                                           IP COUNTRY HEAD                                         ***"
 cd "$CI_DIR/../ip_country"
-ci/all.sh
+ci/all.sh "$PARENT_DIR"
 echo "***                                           IP COUNTRY TAIL                                         ***"
 echo "*********************************************************************************************************"
+