From 43cc0f7fb5e881ac3962d32ed585409bdd01a225 Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Mon, 9 Jan 2023 09:47:17 -0700 Subject: [PATCH 1/4] Update ci-matrix.yml --- .github/workflows/ci-matrix.yml | 63 +++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-matrix.yml b/.github/workflows/ci-matrix.yml index 6128f12e3..1c4739990 100644 --- a/.github/workflows/ci-matrix.yml +++ b/.github/workflows/ci-matrix.yml @@ -9,17 +9,19 @@ on: jobs: build: strategy: - fail-fast: false + fail-fast: true matrix: target: - - { name: linux, os: ubuntu-latest } - - { name: macos, os: macOS-latest } - - { name: windows, os: windows-latest } + - { 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 }} 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: @@ -36,8 +38,7 @@ 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: | ./ci/all.sh @@ -49,3 +50,53 @@ jobs: 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 }} From 5dfd582ca560465479d2879b18291abec09c8fec Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Mon, 9 Jan 2023 09:47:23 -0700 Subject: [PATCH 2/4] Delete s3-release.yml --- .github/workflows/s3-release.yml | 62 -------------------------------- 1 file changed, 62 deletions(-) delete mode 100644 .github/workflows/s3-release.yml diff --git a/.github/workflows/s3-release.yml b/.github/workflows/s3-release.yml deleted file mode 100644 index 3019dd7ba..000000000 --- a/.github/workflows/s3-release.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: s3-release - -on: - workflow_run: - workflows: [ci-matrix] - types: - - completed - -jobs: - deploy_to_s3: - strategy: - matrix: - name: [linux, macos, windows] - 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 - - - if: ${{ startsWith(github.head_ref, 'v*') != true && github.event.workflow_run.conclusion == 'success' }} - 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.name }}' - SOURCE_DIR: 'download/Node-${{ matrix.name }}/generated/bin/' - - - if: ${{ startsWith(github.head_ref, 'v*') == true && github.event.workflow_run.conclusion == 'success' }} - 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.name }}' - SOURCE_DIR: 'download/Node-${{ matrix.name }}/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 e14da4f930d548fdb56f9185a7a89c8ec0962f60 Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Mon, 9 Jan 2023 09:50:19 -0700 Subject: [PATCH 3/4] feat: update to v0.7.1 --- automap/Cargo.toml | 2 +- dns_utility/Cargo.toml | 2 +- masq/Cargo.toml | 2 +- masq_lib/Cargo.toml | 2 +- multinode_integration_tests/Cargo.toml | 2 +- node/Cargo.toml | 2 +- port_exposer/Cargo.toml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/automap/Cargo.toml b/automap/Cargo.toml index e3c98ef7f..8d15523b8 100644 --- a/automap/Cargo.toml +++ b/automap/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "automap" -version = "0.7.0" +version = "0.7.1" authors = ["Dan Wiebe ", "MASQ"] license = "GPL-3.0-only" copyright = "Copyright (c) 2019-2021, MASQ (https://masq.ai) and/or its affiliates. All rights reserved." diff --git a/dns_utility/Cargo.toml b/dns_utility/Cargo.toml index 2df8c6820..21cbebca3 100644 --- a/dns_utility/Cargo.toml +++ b/dns_utility/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dns_utility" -version = "0.7.0" +version = "0.7.1" license = "GPL-3.0-only" authors = ["Dan Wiebe ", "MASQ"] copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved." diff --git a/masq/Cargo.toml b/masq/Cargo.toml index 9da81d27d..c796f6b7d 100644 --- a/masq/Cargo.toml +++ b/masq/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "masq" -version = "0.7.0" +version = "0.7.1" authors = ["Dan Wiebe ", "MASQ"] license = "GPL-3.0-only" copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved." diff --git a/masq_lib/Cargo.toml b/masq_lib/Cargo.toml index b871d2334..04eccbb2f 100644 --- a/masq_lib/Cargo.toml +++ b/masq_lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "masq_lib" -version = "0.7.0" +version = "0.7.1" authors = ["Dan Wiebe ", "MASQ"] license = "GPL-3.0-only" copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved." diff --git a/multinode_integration_tests/Cargo.toml b/multinode_integration_tests/Cargo.toml index 674220dad..b31f772e5 100644 --- a/multinode_integration_tests/Cargo.toml +++ b/multinode_integration_tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multinode_integration_tests" -version = "0.7.0" +version = "0.7.1" authors = ["Dan Wiebe ", "MASQ"] license = "GPL-3.0-only" copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved." diff --git a/node/Cargo.toml b/node/Cargo.toml index 44e752515..3f8d369f0 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "node" -version = "0.7.0" +version = "0.7.1" license = "GPL-3.0-only" authors = ["Dan Wiebe ", "MASQ"] copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved." diff --git a/port_exposer/Cargo.toml b/port_exposer/Cargo.toml index 6a6ec87f0..ad667bc26 100644 --- a/port_exposer/Cargo.toml +++ b/port_exposer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "port_exposer" -version = "0.7.0" +version = "0.7.1" authors = ["Dan Wiebe ", "MASQ"] license = "GPL-3.0-only" copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved." From d2ec134cbe5a67487e0600661488288ab4094293 Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Mon, 9 Jan 2023 15:12:02 -0700 Subject: [PATCH 4/4] Update ci-matrix.yml --- .github/workflows/ci-matrix.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/ci-matrix.yml b/.github/workflows/ci-matrix.yml index 1c4739990..fd227c687 100644 --- a/.github/workflows/ci-matrix.yml +++ b/.github/workflows/ci-matrix.yml @@ -41,15 +41,8 @@ jobs: key: ${{ runner.os }}-cargo - name: Build ${{ matrix.target.os }} run: | - ./ci/all.sh - ./ci/multinode_integration_test.sh - ./ci/collect_results.sh + ./ci/format.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: @@ -61,11 +54,6 @@ jobs: 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