From e720d56e417a656ec56353b2c61cf4a7de4d9ff8 Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Sun, 2 Apr 2023 23:13:55 -0600 Subject: [PATCH 01/12] Update ci-matrix.yml --- .github/workflows/ci-matrix.yml | 86 ++------------------------------- 1 file changed, 5 insertions(+), 81 deletions(-) diff --git a/.github/workflows/ci-matrix.yml b/.github/workflows/ci-matrix.yml index 1c4739990..0406621b4 100644 --- a/.github/workflows/ci-matrix.yml +++ b/.github/workflows/ci-matrix.yml @@ -8,16 +8,8 @@ on: jobs: build: - strategy: - fail-fast: true - matrix: - target: - - { name: linux, os: ubuntu-22.04 } - - { name: macos, os: macos-12 } - - { name: windows, os: windows-2022 } - - name: Build node on ${{ matrix.target.os }} - runs-on: ${{ matrix.target.os }} + name: Build node onubuntu-22.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 with: @@ -29,74 +21,6 @@ jobs: toolchain: 1.63.0 components: rustfmt, clippy override: true - - uses: actions/cache@v3 - with: - path: | - ~/.cargo/bin/ - ~/.cargo/cache/ - ~/.cargo/registry/index/ - ~/.cargo/registry/cache/ - ~/.cargo/git/db/ - target/ - key: ${{ runner.os }}-cargo - - name: Build ${{ matrix.target.os }} - run: | - ./ci/all.sh - ./ci/multinode_integration_test.sh - ./ci/collect_results.sh - shell: bash - - name: Publish ${{ matrix.target.os }} - uses: actions/upload-artifact@v3 - with: - name: Node-${{ matrix.target.name }} - path: results - deploy_to_s3: - needs: build - strategy: - matrix: - os: [linux, macos, windows] - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.sha }} - - - uses: actions/download-artifact@v3 - - - name: Display structure of downloaded files - run: ls -R - - - if: startsWith(github.head_ref, 'GH') - name: Versioned S3 Sync - 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.event.workflow_run.head_branch }}/Node-${{ matrix.os }}' - SOURCE_DIR: 'Node-${{ matrix.os }}/generated/bin/' - - - if: startsWith(github.head_ref, 'v') - name: Latest S3 Sync - 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 - env: - DISTRIBUTION: ${{ secrets.DISTRIBUTION }} - PATHS: "/Node*" - AWS_REGION: "us-west-2" - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + - name: testing ls + run: ls; cd node; ls; cd ..; ls + From 54987d20f63d304cf61747b9959c0589b659c642 Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Sun, 2 Apr 2023 23:14:24 -0600 Subject: [PATCH 02/12] Update ci-matrix.yml --- .github/workflows/ci-matrix.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/ci-matrix.yml b/.github/workflows/ci-matrix.yml index 0406621b4..e57fd2438 100644 --- a/.github/workflows/ci-matrix.yml +++ b/.github/workflows/ci-matrix.yml @@ -14,13 +14,6 @@ jobs: - uses: actions/checkout@v3 with: ref: ${{ github.event.pull_request.head.sha }} - - name: Stable with rustfmt and clippy - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: 1.63.0 - components: rustfmt, clippy - override: true - name: testing ls run: ls; cd node; ls; cd ..; ls From fb9aaf4a104d5e6e2c79f6eefc2e469280847fc7 Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Sun, 2 Apr 2023 23:18:46 -0600 Subject: [PATCH 03/12] Update ci-matrix.yml --- .github/workflows/ci-matrix.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-matrix.yml b/.github/workflows/ci-matrix.yml index 0406621b4..e46900273 100644 --- a/.github/workflows/ci-matrix.yml +++ b/.github/workflows/ci-matrix.yml @@ -22,5 +22,10 @@ jobs: components: rustfmt, clippy override: true - name: testing ls - run: ls; cd node; ls; cd ..; ls + run: | + ls + cd node + ls + cd ../automap + ls From f96f7c93750fba675de0aea24ea633242f5fa0f9 Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Sun, 2 Apr 2023 23:20:13 -0600 Subject: [PATCH 04/12] Update ci-matrix.yml --- .github/workflows/ci-matrix.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-matrix.yml b/.github/workflows/ci-matrix.yml index e57fd2438..ea0563e17 100644 --- a/.github/workflows/ci-matrix.yml +++ b/.github/workflows/ci-matrix.yml @@ -15,5 +15,10 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - name: testing ls - run: ls; cd node; ls; cd ..; ls + run: | + ls + cd node + ls + cd ../masq + ls From 3dd13c3e90125e03ae7d355ba3a359d8b4d8d1f5 Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Mon, 3 Apr 2023 00:34:09 -0600 Subject: [PATCH 05/12] Update ci-matrix.yml --- .github/workflows/ci-matrix.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci-matrix.yml b/.github/workflows/ci-matrix.yml index e46900273..b410ff567 100644 --- a/.github/workflows/ci-matrix.yml +++ b/.github/workflows/ci-matrix.yml @@ -24,8 +24,6 @@ jobs: - name: testing ls run: | ls - cd node - ls - cd ../automap + cd node/ci ls From 35661d9524a972a6256e861a956e3c1c83b21fcd Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Mon, 3 Apr 2023 00:36:59 -0600 Subject: [PATCH 06/12] Update ci-matrix.yml --- .github/workflows/ci-matrix.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci-matrix.yml b/.github/workflows/ci-matrix.yml index b410ff567..9f49d013b 100644 --- a/.github/workflows/ci-matrix.yml +++ b/.github/workflows/ci-matrix.yml @@ -8,22 +8,17 @@ on: jobs: build: - name: Build node onubuntu-22.04 - runs-on: ubuntu-22.04 + name: Build node + runs-on: [ubuntu-22.04, windows-2022, macos-12] steps: - uses: actions/checkout@v3 with: ref: ${{ github.event.pull_request.head.sha }} - - name: Stable with rustfmt and clippy - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: 1.63.0 - components: rustfmt, clippy - override: true - name: testing ls run: | ls cd node/ci ls + cd ../automap + ls From 34266499174c9907f8157a9288b16fa0838e7311 Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Mon, 3 Apr 2023 00:38:44 -0600 Subject: [PATCH 07/12] Update ci-matrix.yml --- .github/workflows/ci-matrix.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-matrix.yml b/.github/workflows/ci-matrix.yml index 9f49d013b..f156c8dee 100644 --- a/.github/workflows/ci-matrix.yml +++ b/.github/workflows/ci-matrix.yml @@ -9,7 +9,10 @@ on: jobs: build: name: Build node - runs-on: [ubuntu-22.04, windows-2022, macos-12] + strategy: + matrix: + os: [ubuntu-22.04, macos-12, windows-2022] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 with: From f9db1d1afc21c5e45a2e3249a3d81e655e546179 Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Mon, 3 Apr 2023 00:40:58 -0600 Subject: [PATCH 08/12] Update ci-matrix.yml --- .github/workflows/ci-matrix.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-matrix.yml b/.github/workflows/ci-matrix.yml index f156c8dee..e17bd17ac 100644 --- a/.github/workflows/ci-matrix.yml +++ b/.github/workflows/ci-matrix.yml @@ -22,6 +22,7 @@ jobs: ls cd node/ci ls - cd ../automap + cd .. + cd automap ls From 6ad3f524555dd6be981ca6f1d4cb04121095a338 Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Mon, 3 Apr 2023 00:44:59 -0600 Subject: [PATCH 09/12] Update ci-matrix.yml --- .github/workflows/ci-matrix.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-matrix.yml b/.github/workflows/ci-matrix.yml index e17bd17ac..cb0db92a8 100644 --- a/.github/workflows/ci-matrix.yml +++ b/.github/workflows/ci-matrix.yml @@ -19,10 +19,9 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: testing ls run: | + pwd ls - cd node/ci - ls - cd .. - cd automap + cd ~ + pwd ls From 7ff69a93a72c7f4fc713f0e0b5acc29343051aae Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Mon, 3 Apr 2023 00:49:56 -0600 Subject: [PATCH 10/12] Update ci-matrix.yml --- .github/workflows/ci-matrix.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-matrix.yml b/.github/workflows/ci-matrix.yml index cb0db92a8..5f672dbf3 100644 --- a/.github/workflows/ci-matrix.yml +++ b/.github/workflows/ci-matrix.yml @@ -13,15 +13,12 @@ jobs: matrix: os: [ubuntu-22.04, macos-12, windows-2022] runs-on: ${{ matrix.os }} + env: + $CI_DIR: pwd steps: - uses: actions/checkout@v3 with: ref: ${{ github.event.pull_request.head.sha }} - name: testing ls - run: | - pwd - ls - cd ~ - pwd - ls + run: $CI_DIR From e285330aac468f5f4cb33cbb25daaa45f7b6caab Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Mon, 3 Apr 2023 00:54:43 -0600 Subject: [PATCH 11/12] Update ci-matrix.yml --- .github/workflows/ci-matrix.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-matrix.yml b/.github/workflows/ci-matrix.yml index 5f672dbf3..f794208a3 100644 --- a/.github/workflows/ci-matrix.yml +++ b/.github/workflows/ci-matrix.yml @@ -20,5 +20,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - name: testing ls - run: $CI_DIR + run: | + echo $CI_DIR + echo $GITHUB_WORKSPACE From 4427e753d4972db59649b3864a8991add1dc326b Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Mon, 3 Apr 2023 01:02:34 -0600 Subject: [PATCH 12/12] Update ci-matrix.yml --- .github/workflows/ci-matrix.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci-matrix.yml b/.github/workflows/ci-matrix.yml index f794208a3..5646fb1a1 100644 --- a/.github/workflows/ci-matrix.yml +++ b/.github/workflows/ci-matrix.yml @@ -21,6 +21,5 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: testing ls run: | - echo $CI_DIR - echo $GITHUB_WORKSPACE + echo ${{ github.workspace }}