From 1d903d4f41ebb89e7cd5407977ea34a17fc194cc Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Tue, 4 Oct 2022 11:28:17 -0600 Subject: [PATCH 01/11] Update s3-release.yml --- .github/workflows/s3-release.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/s3-release.yml b/.github/workflows/s3-release.yml index ce49ba667..30ddd3002 100644 --- a/.github/workflows/s3-release.yml +++ b/.github/workflows/s3-release.yml @@ -3,12 +3,11 @@ name: s3-release on: workflow_run: workflows: [ci-matrix] - types: - - completed + types: [completed] jobs: deploy_to_versioned_s3: - if: startsWith(github.head_ref, 'v*') != true + if: startsWith(github.head_ref, 'v*') != true and ${{workflow_run.conclusion}} == true runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From 663ee3cba3aa4d6346b847267f75d7c546baf9ab Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Tue, 4 Oct 2022 11:31:37 -0600 Subject: [PATCH 02/11] Update ci-matrix.yml --- .github/workflows/ci-matrix.yml | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/.github/workflows/ci-matrix.yml b/.github/workflows/ci-matrix.yml index 2b6b204b1..f1168f289 100644 --- a/.github/workflows/ci-matrix.yml +++ b/.github/workflows/ci-matrix.yml @@ -3,8 +3,7 @@ name: ci-matrix on: pull_request: types: [opened, reopened, synchronize] - branches: - - master + branches: [master] jobs: build: @@ -31,28 +30,3 @@ jobs: target/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} restore-keys: ${{ runner.OS }}-cargo- - - name: Build ${{ matrix.target.os }} - run: | - rustup check - case "$OSTYPE" in - msys) - echo "Windows doesn't like it when rustup updates itself" - rustup update --no-self-update stable - ;; - *) - echo "Linux and macOS don't need manual suppression of rustup self update" - rustup update stable - ;; - esac - rustup check - rustup component add rustfmt - rustup component add clippy - ./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 From 29b1eccac018009d5dd58cf2ec64f2f9cbb3092e Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Tue, 4 Oct 2022 11:33:12 -0600 Subject: [PATCH 03/11] Update s3-release.yml --- .github/workflows/s3-release.yml | 106 +------------------------------ 1 file changed, 2 insertions(+), 104 deletions(-) diff --git a/.github/workflows/s3-release.yml b/.github/workflows/s3-release.yml index 30ddd3002..260662b22 100644 --- a/.github/workflows/s3-release.yml +++ b/.github/workflows/s3-release.yml @@ -7,113 +7,11 @@ on: jobs: deploy_to_versioned_s3: - if: startsWith(github.head_ref, 'v*') != true and ${{workflow_run.conclusion}} == true + if: startsWith(github.head_ref, 'v*') != true and ${{ github.event.workflow_run.conclusion }} == true runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Download artifacts from PR - run: | - mkdir download - cd download - gh run download ${{ github.event.workflow_run.id }} - env: + env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Display structure of downloaded files - run: ls -R download - - name: Linux 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-linux' - SOURCE_DIR: 'download/Node-linux/generated/bin/' - - name: Windows 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-windows' - SOURCE_DIR: 'download/Node-windows/generated/bin/' - - name: MacOS 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-macos' - SOURCE_DIR: 'download/Node-macos/generated/bin/' - - name: Invalidate Binaries CloudFront - uses: chetan/invalidate-cloudfront-action@v2.3 - 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 }} - - deploy_to_latest_s3: - if: startsWith(github.head_ref, 'v*') == true - runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Download artifacts from PR - run: | - mkdir download - cd download - gh run download ${{ github.event.workflow_run.id }} - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Display structure of downloaded files run: ls -R download - - name: Linux 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-linux' - SOURCE_DIR: 'download/Node-linux/generated/bin/' - - name: Windows 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-windows' - SOURCE_DIR: 'download/Node-windows/generated/bin/' - - name: MacOS 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-macos' - SOURCE_DIR: 'download/Node-macos/generated/bin/' - - name: Invalidate Binaries CloudFront - uses: chetan/invalidate-cloudfront-action@v2.3 - 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 }} From 5a150de69e8258f151c793eacb7fa486cc037432 Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Tue, 4 Oct 2022 11:33:59 -0600 Subject: [PATCH 04/11] Update Cargo.toml --- node/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node/Cargo.toml b/node/Cargo.toml index 1a3b8f366..e2ad2f143 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "node" -version = "0.6.2" +version = "0.6.3" license = "GPL-3.0-only" authors = ["Dan Wiebe ", "MASQ"] copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved." @@ -105,4 +105,4 @@ cargo-bundle = "0.4.0" expose_test_privates = [] #[profile.release] -#opt-level = 0 \ No newline at end of file +#opt-level = 0 From e62dba490d5545963cc52339bfbd00f8dc43c216 Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Tue, 4 Oct 2022 11:38:46 -0600 Subject: [PATCH 05/11] Update s3-release.yml --- .github/workflows/s3-release.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/s3-release.yml b/.github/workflows/s3-release.yml index 260662b22..c4e6cbcda 100644 --- a/.github/workflows/s3-release.yml +++ b/.github/workflows/s3-release.yml @@ -6,12 +6,23 @@ on: types: [completed] jobs: - deploy_to_versioned_s3: - if: startsWith(github.head_ref, 'v*') != true and ${{ github.event.workflow_run.conclusion }} == true + successful_test: + if: startsWith(github.head_ref, 'v*') != true and ${{ github.event.workflow_run.conclusion }} == success runs-on: ubuntu-latest env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v3 - - name: Display structure of downloaded files - run: ls -R download + - name: Echo results + run: | + echo "the test was a success" + unsuccessful_test: + if: startsWith(github.head_ref, 'v*') != true and ${{ github.event.workflow_run.conclusion }} != success + runs-on: ubuntu-latest + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + steps: + - uses: actions/checkout@v3 + - name: Echo results + run: | + echo "the test was NOT a success" From 352df4775fe7d87fd49047dd9d8dbec08ff9cce0 Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Tue, 4 Oct 2022 11:39:10 -0600 Subject: [PATCH 06/11] Update s3-release.yml --- .github/workflows/s3-release.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/s3-release.yml b/.github/workflows/s3-release.yml index 260662b22..c4e6cbcda 100644 --- a/.github/workflows/s3-release.yml +++ b/.github/workflows/s3-release.yml @@ -6,12 +6,23 @@ on: types: [completed] jobs: - deploy_to_versioned_s3: - if: startsWith(github.head_ref, 'v*') != true and ${{ github.event.workflow_run.conclusion }} == true + successful_test: + if: startsWith(github.head_ref, 'v*') != true and ${{ github.event.workflow_run.conclusion }} == success runs-on: ubuntu-latest env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v3 - - name: Display structure of downloaded files - run: ls -R download + - name: Echo results + run: | + echo "the test was a success" + unsuccessful_test: + if: startsWith(github.head_ref, 'v*') != true and ${{ github.event.workflow_run.conclusion }} != success + runs-on: ubuntu-latest + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + steps: + - uses: actions/checkout@v3 + - name: Echo results + run: | + echo "the test was NOT a success" From 0838897b88b4147feac2bbbd6965ec15e00571bb Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Tue, 4 Oct 2022 11:46:26 -0600 Subject: [PATCH 07/11] Update s3-release.yml --- .github/workflows/s3-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/s3-release.yml b/.github/workflows/s3-release.yml index c4e6cbcda..387aa5f76 100644 --- a/.github/workflows/s3-release.yml +++ b/.github/workflows/s3-release.yml @@ -7,7 +7,7 @@ on: jobs: successful_test: - if: startsWith(github.head_ref, 'v*') != true and ${{ github.event.workflow_run.conclusion }} == success + if: startsWith(github.head_ref, 'v*') != true and ${{ github.event.check_run.conclusion }} == success runs-on: ubuntu-latest env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -17,7 +17,7 @@ jobs: run: | echo "the test was a success" unsuccessful_test: - if: startsWith(github.head_ref, 'v*') != true and ${{ github.event.workflow_run.conclusion }} != success + if: startsWith(github.head_ref, 'v*') != true and ${{ github.event.check_run.conclusion }} == failure runs-on: ubuntu-latest env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 9f0e79f20230940e139056c0f803cec5b7e82472 Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Tue, 4 Oct 2022 11:50:44 -0600 Subject: [PATCH 08/11] Update s3-release.yml --- .github/workflows/s3-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/s3-release.yml b/.github/workflows/s3-release.yml index 387aa5f76..c773dbf3e 100644 --- a/.github/workflows/s3-release.yml +++ b/.github/workflows/s3-release.yml @@ -7,7 +7,7 @@ on: jobs: successful_test: - if: startsWith(github.head_ref, 'v*') != true and ${{ github.event.check_run.conclusion }} == success + if: startsWith(github.head_ref, 'v*') != true and startsWith(github.event.workflow_run.conclusion, 'success') == true runs-on: ubuntu-latest env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -17,7 +17,7 @@ jobs: run: | echo "the test was a success" unsuccessful_test: - if: startsWith(github.head_ref, 'v*') != true and ${{ github.event.check_run.conclusion }} == failure + if: startsWith(github.head_ref, 'v*') != true and startsWith(github.event.workflow_run.conclusion, 'success') != true runs-on: ubuntu-latest env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 6badfcff4673aff7eacbdc87df4ad70ab1134fa9 Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Tue, 4 Oct 2022 11:59:19 -0600 Subject: [PATCH 09/11] Update s3-release.yml --- .github/workflows/s3-release.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/s3-release.yml b/.github/workflows/s3-release.yml index c773dbf3e..e83c2a7b0 100644 --- a/.github/workflows/s3-release.yml +++ b/.github/workflows/s3-release.yml @@ -7,22 +7,23 @@ on: jobs: successful_test: - if: startsWith(github.head_ref, 'v*') != true and startsWith(github.event.workflow_run.conclusion, 'success') == true + if: startsWith(github.head_ref, 'v*') != true runs-on: ubuntu-latest env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v3 - - name: Echo results + - name: "Set flag from conclusion" + env: + COMMIT_VAR: ${{ contains(github.event.workflow_run.conclusion, 'success') }} run: | - echo "the test was a success" - unsuccessful_test: - if: startsWith(github.head_ref, 'v*') != true and startsWith(github.event.workflow_run.conclusion, 'success') != true - runs-on: ubuntu-latest - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - steps: - - uses: actions/checkout@v3 - - name: Echo results - run: | - echo "the test was NOT a success" + if ${COMMIT_VAR} == true; then + echo "flag=true" >> $GITHUB_ENV + echo "flag set to true" + else + echo "flag=false" >> $GITHUB_ENV + echo "flag set to false" + fi + - name: "Use flag if true" + if: env.flag + run: echo "Flag is available and true" From 11b069b455a875a8678630c38fb58f5c67adca5d Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Tue, 4 Oct 2022 12:09:41 -0600 Subject: [PATCH 10/11] Update s3-release.yml --- .github/workflows/s3-release.yml | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/.github/workflows/s3-release.yml b/.github/workflows/s3-release.yml index e83c2a7b0..ab98563fc 100644 --- a/.github/workflows/s3-release.yml +++ b/.github/workflows/s3-release.yml @@ -7,23 +7,18 @@ on: jobs: successful_test: - if: startsWith(github.head_ref, 'v*') != true + if: ${{ startsWith(github.head_ref, 'v*') != true }} && ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v3 - - name: "Set flag from conclusion" - env: - COMMIT_VAR: ${{ contains(github.event.workflow_run.conclusion, 'success') }} - run: | - if ${COMMIT_VAR} == true; then - echo "flag=true" >> $GITHUB_ENV - echo "flag set to true" - else - echo "flag=false" >> $GITHUB_ENV - echo "flag set to false" - fi - - name: "Use flag if true" - if: env.flag - run: echo "Flag is available and true" + - run: echo "This test was a success" + unsuccessful_test: + if: ${{ startsWith(github.head_ref, 'v*') != true }} && ${{ github.event.workflow_run.conclusion != 'success' }} + runs-on: ubuntu-latest + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + steps: + - uses: actions/checkout@v3 + - run: echo "This test was a failure" From a5604b1d38d2114b98df4bb3168d29e398f86f05 Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Tue, 4 Oct 2022 12:12:26 -0600 Subject: [PATCH 11/11] Update s3-release.yml --- .github/workflows/s3-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/s3-release.yml b/.github/workflows/s3-release.yml index ab98563fc..34eff50ce 100644 --- a/.github/workflows/s3-release.yml +++ b/.github/workflows/s3-release.yml @@ -7,7 +7,7 @@ on: jobs: successful_test: - if: ${{ startsWith(github.head_ref, 'v*') != true }} && ${{ github.event.workflow_run.conclusion == 'success' }} + if: ${{ startsWith(github.head_ref, 'v*') != true && github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v3 - run: echo "This test was a success" unsuccessful_test: - if: ${{ startsWith(github.head_ref, 'v*') != true }} && ${{ github.event.workflow_run.conclusion != 'success' }} + if: ${{ startsWith(github.head_ref, 'v*') != true && github.event.workflow_run.conclusion != 'success' }} runs-on: ubuntu-latest env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}