diff --git a/.github/workflows/ci-matrix.yml b/.github/workflows/ci-matrix.yml index 2b6b204b1..f1168f289 100644 --- a/.github/workflows/ci-matrix.yml +++ b/.github/workflows/ci-matrix.yml @@ -3,8 +3,7 @@ name: ci-matrix on: pull_request: types: [opened, reopened, synchronize] - branches: - - master + branches: [master] jobs: build: @@ -31,28 +30,3 @@ jobs: target/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} restore-keys: ${{ runner.OS }}-cargo- - - 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 diff --git a/.github/workflows/s3-release.yml b/.github/workflows/s3-release.yml index ce49ba667..34eff50ce 100644 --- a/.github/workflows/s3-release.yml +++ b/.github/workflows/s3-release.yml @@ -3,118 +3,22 @@ name: s3-release on: workflow_run: workflows: [ci-matrix] - types: - - completed + types: [completed] jobs: - deploy_to_versioned_s3: - if: startsWith(github.head_ref, 'v*') != true + successful_test: + if: ${{ startsWith(github.head_ref, 'v*') != true && github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Download artifacts from PR - run: | - mkdir download - cd download - gh run download ${{ github.event.workflow_run.id }} - env: + env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Display structure of downloaded files - run: ls -R download - - name: Linux 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-linux' - SOURCE_DIR: 'download/Node-linux/generated/bin/' - - name: Windows 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-windows' - SOURCE_DIR: 'download/Node-windows/generated/bin/' - - name: MacOS 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-macos' - SOURCE_DIR: 'download/Node-macos/generated/bin/' - - name: Invalidate Binaries CloudFront - uses: chetan/invalidate-cloudfront-action@v2.3 - 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 }} - - deploy_to_latest_s3: - if: startsWith(github.head_ref, 'v*') == true - runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Download artifacts from PR - run: | - mkdir download - cd download - gh run download ${{ github.event.workflow_run.id }} - env: + - run: echo "This test was a success" + unsuccessful_test: + if: ${{ startsWith(github.head_ref, 'v*') != true && github.event.workflow_run.conclusion != 'success' }} + runs-on: ubuntu-latest + env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Display structure of downloaded files - run: ls -R download - - name: Linux 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-linux' - SOURCE_DIR: 'download/Node-linux/generated/bin/' - - name: Windows 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-windows' - SOURCE_DIR: 'download/Node-windows/generated/bin/' - - name: MacOS 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-macos' - SOURCE_DIR: 'download/Node-macos/generated/bin/' - - name: Invalidate Binaries CloudFront - uses: chetan/invalidate-cloudfront-action@v2.3 - 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 }} + steps: + - uses: actions/checkout@v3 + - run: echo "This test was a failure" 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