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 1/2] 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 b679a4b3968121161c1baa415f1b8c4302ae6bc8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Apr 2023 05:19:55 +0000 Subject: [PATCH 2/2] Bump openssl-src from 111.12.0+1.1.1h to 111.25.0+1.1.1t in /node Bumps [openssl-src](https://github.com/alexcrichton/openssl-src-rs) from 111.12.0+1.1.1h to 111.25.0+1.1.1t. - [Release notes](https://github.com/alexcrichton/openssl-src-rs/releases) - [Commits](https://github.com/alexcrichton/openssl-src-rs/commits) --- updated-dependencies: - dependency-name: openssl-src dependency-type: indirect ... Signed-off-by: dependabot[bot] --- node/Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node/Cargo.lock b/node/Cargo.lock index dac811f03..f15cfa99f 100644 --- a/node/Cargo.lock +++ b/node/Cargo.lock @@ -2347,9 +2347,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" [[package]] name = "openssl-src" -version = "111.12.0+1.1.1h" +version = "111.25.0+1.1.1t" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "858a4132194f8570a7ee9eb8629e85b23cbc4565f2d4a162e87556e5956abf61" +checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6" dependencies = [ "cc", ]