From a1979cff9b1df0db7deacbb98d3ded745565c75f Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Mon, 5 Sep 2022 16:07:47 -0600 Subject: [PATCH 1/3] Update s3-release.yml --- .github/workflows/s3-release.yml | 69 ++------------------------------ 1 file changed, 3 insertions(+), 66 deletions(-) diff --git a/.github/workflows/s3-release.yml b/.github/workflows/s3-release.yml index 9a6a24f23..7e648202a 100644 --- a/.github/workflows/s3-release.yml +++ b/.github/workflows/s3-release.yml @@ -2,76 +2,13 @@ name: s3-release on: push: - branches: - - master - - 'releases/**' tags: - v* jobs: - build: - strategy: - fail-fast: false - matrix: - target: - - { name: linux, os: ubuntu-latest } - - { name: macos, os: macOS-latest } - - { name: windows, os: windows-latest } - - name: Build node on ${{ matrix.target.os }} - runs-on: ${{ matrix.target.os }} - steps: - - uses: actions/checkout@v3 - - name: Cache sccache results - uses: actions/cache@v3 - env: - cache-name: cache-node-modules - with: - path: ~/.cargo/cache - key: ${{ runner.os }}-0001 - - 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/generated/bin - deploy_to_s3: - needs: ["build"] + run_if: + if: startsWith(github.head_ref, 'v*') runs-on: ubuntu-latest steps: - - uses: actions/download-artifact@v3 - id: download - - name: Display structure of downloaded files - run: ls -R - name: 'Echo download path' - run: echo ${{steps.download.outputs.download-path}} - - name: 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' - SOURCE_DIR: ${{ steps.download.outputs.download-path }} + run: echo ${{github.head_ref}} From ee9db8157b3b85000b76f6720ab41a3457b21c21 Mon Sep 17 00:00:00 2001 From: FinsaasGH <89403560+FinsaasGH@users.noreply.github.com> Date: Mon, 5 Sep 2022 16:20:09 -0600 Subject: [PATCH 2/3] Update Cargo.toml (#44) --- 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 ef9b1df39ab1ac6787c90c6d0eb7c3e0d7091422 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Sep 2022 23:48:29 +0000 Subject: [PATCH 3/3] Create bump-version.yml --- automap/Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/automap/Cargo.lock b/automap/Cargo.lock index c877524c0..62feda719 100644 --- a/automap/Cargo.lock +++ b/automap/Cargo.lock @@ -1500,9 +1500,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "regex" -version = "1.5.4" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" dependencies = [ "aho-corasick", "memchr", @@ -1511,9 +1511,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" [[package]] name = "resolv-conf"