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/2] 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 08d735857dc4fd4945dfb40ac6f61a22987abd55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 16:47:48 +0000 Subject: [PATCH 2/2] Create bump-version.yml --- node/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/Cargo.toml b/node/Cargo.toml index 44e752515..4dbcd192b 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -56,7 +56,7 @@ sysinfo = "0.21.1" tiny-bip39 = "0.8.2" tiny-hderive = "0.3.0" thousands = "0.2.0" -tokio = "0.1.22" +tokio = "1.15.0" tokio-core = "0.1.18" toml = "0.5.8" trust-dns = "0.17.0"