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 b22de40f6a6f6e749a46c801aea99f831309cf2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Apr 2023 05:18:27 +0000 Subject: [PATCH 2/2] Bump openssl from 0.10.38 to 0.10.49 in /node Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.38 to 0.10.49. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.38...openssl-v0.10.49) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- node/Cargo.lock | 21 ++++++++++++++++----- node/Cargo.toml | 2 +- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/node/Cargo.lock b/node/Cargo.lock index dac811f03..a7ec01ef3 100644 --- a/node/Cargo.lock +++ b/node/Cargo.lock @@ -2327,18 +2327,30 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.38" +version = "0.10.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" +checksum = "4d2f106ab837a24e03672c59b1239669a0596406ff657c3c0835b6b7f0f35a33" dependencies = [ "bitflags", "cfg-if 1.0.0", "foreign-types", "libc", "once_cell", + "openssl-macros", "openssl-sys", ] +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", +] + [[package]] name = "openssl-probe" version = "0.1.2" @@ -2356,11 +2368,10 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.72" +version = "0.9.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" +checksum = "3a20eace9dc2d82904039cb76dcf50fb1a0bba071cfd1629720b5d6f1ddba0fa" dependencies = [ - "autocfg 1.0.1", "cc", "libc", "openssl-src", diff --git a/node/Cargo.toml b/node/Cargo.toml index d92699af1..3a249fa59 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -73,7 +73,7 @@ core-foundation = "0.7.0" [target.'cfg(not(target_os = "windows"))'.dependencies] daemonize = "0.4.1" nix = "0.23.0" -openssl = {version = "0.10.38", features = ["vendored"]} +openssl = {version = "0.10.49", features = ["vendored"]} [target.'cfg(target_os = "windows")'.dependencies] winreg = "0.10.1"