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 }} diff --git a/masq/Cargo.toml b/masq/Cargo.toml index 9da81d27d..23e16ee2e 100644 --- a/masq/Cargo.toml +++ b/masq/Cargo.toml @@ -19,7 +19,7 @@ lazy_static = "1.4.0" linefeed = "0.6.0" masq_lib = { path = "../masq_lib" } num = "0.4.0" -regex = "1.5.4" +regex = "1.5.5" thousands = "0.2.0" websocket = {version = "0.26.2", default-features = false, features = ["sync"]} ctrlc = "3.2.1" diff --git a/masq_lib/Cargo.toml b/masq_lib/Cargo.toml index b871d2334..32c69a6dc 100644 --- a/masq_lib/Cargo.toml +++ b/masq_lib/Cargo.toml @@ -17,7 +17,7 @@ crossbeam-channel = "0.5.1" itertools = "0.10.1" lazy_static = "1.4.0" log = "0.4.8" -regex = "1.5.4" +regex = "1.5.5" serde = "1.0.133" serde_derive = "1.0.133" serde_json = "1.0.74" diff --git a/multinode_integration_tests/Cargo.toml b/multinode_integration_tests/Cargo.toml index 674220dad..1ae56e8ee 100644 --- a/multinode_integration_tests/Cargo.toml +++ b/multinode_integration_tests/Cargo.toml @@ -22,7 +22,7 @@ native-tls = "0.2.8" node = { path = "../node", features = [ "expose_test_privates" ] } pretty-hex = "0.2.1" primitive-types = {version = "0.5.0", default-features = false, features = ["default", "rlp", "serde"] } -regex = "1.5.4" +regex = "1.5.5" rusqlite = {version = "0.28.0", features = ["bundled"]} rustc-hex = "2.1.0" serde = "1.0.130" diff --git a/node/Cargo.lock b/node/Cargo.lock index 86a081080..fab706f40 100644 --- a/node/Cargo.lock +++ b/node/Cargo.lock @@ -2981,9 +2981,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" dependencies = [ "aho-corasick", "memchr", diff --git a/node/Cargo.toml b/node/Cargo.toml index 44e752515..c6f359f28 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -41,7 +41,7 @@ paste = "1.0.6" pretty-hex = "0.2.1" primitive-types = {version = "0.5.0", default-features = false, features = ["default", "rlp", "serde"]} rand = {version = "0.8.4", features = ["getrandom", "small_rng"]} -regex = "1.5.4" +regex = "1.5.5" rlp = "0.4.6" rpassword = "5.0.1" rusqlite = {version = "0.28.0", features = ["bundled","functions"]}