From 2a5f2b20b6e3057433a50379e21ad392e149d421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Wed, 14 Oct 2020 14:12:35 +0200 Subject: [PATCH 1/2] Indent YAML files with 2 spaces --- .editorconfig | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index b93a897943..f16486f882 100644 --- a/.editorconfig +++ b/.editorconfig @@ -66,7 +66,7 @@ dotnet_naming_symbols.static_fields.applicable_kinds = field dotnet_naming_symbols.static_fields.required_modifiers = static dotnet_naming_symbols.static_fields.applicable_accessibilities = private, internal, private_protected dotnet_naming_style.static_prefix_style.required_prefix = s_ -dotnet_naming_style.static_prefix_style.capitalization = camel_case +dotnet_naming_style.static_prefix_style.capitalization = camel_case # internal and private fields should be _camelCase dotnet_naming_rule.camel_case_for_private_internal_fields.severity = suggestion @@ -75,7 +75,7 @@ dotnet_naming_rule.camel_case_for_private_internal_fields.style = camel_case_ dotnet_naming_symbols.private_internal_fields.applicable_kinds = field dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal dotnet_naming_style.camel_case_underscore_style.required_prefix = _ -dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case +dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case # Code style defaults csharp_using_directive_placement = outside_namespace:suggestion @@ -183,3 +183,7 @@ indent_size = 2 end_of_line = lf [*.{cmd, bat}] end_of_line = crlf + +# YAML files +[*.yml] +indent_size = 2 From d37e703fbadfd1b71dabb01968253aa964215420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Wed, 14 Oct 2020 14:47:14 +0200 Subject: [PATCH 2/2] Replace Travis CI with GitHub Actions Linux workflow --- .github/workflows/test-linux.yml | 34 ++++++++++++++++++++++++++ .travis.yml | 42 -------------------------------- 2 files changed, 34 insertions(+), 42 deletions(-) create mode 100644 .github/workflows/test-linux.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml new file mode 100644 index 0000000000..0c8cfedf86 --- /dev/null +++ b/.github/workflows/test-linux.yml @@ -0,0 +1,34 @@ +name: Build (Linux) + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: ubuntu-latest + + services: + rabbitmq: + image: rabbitmq:3.8.9-management + ports: + - 5672:5672 + - 15672:15672 + + steps: + - uses: actions/checkout@v2 + + - name: Setup .NET Core + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 3.1.x + + - name: Build + run: dotnet build --configuration Release + + - name: Test + run: dotnet test --configuration Release --framework 'netcoreapp3.1' --no-build + env: + RABBITMQ_RABBITMQCTL_PATH: DOCKER:${{job.services.rabbitmq.id}} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 05fd3cd02f..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,42 +0,0 @@ -sudo: false -dist: xenial -language: csharp -dotnet: 3.1 -mono: none - -addons: - apt: - sources: - - sourceline: deb https://packages.erlang-solutions.com/ubuntu trusty contrib - key_url: https://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc - packages: - - erlang-nox - -env: - global: - - RABBITMQ_VERSION=3.8.9 - - RABBITMQ_DOWNLOAD_URL="https://github.com/rabbitmq/rabbitmq-server/releases/download/v$RABBITMQ_VERSION/rabbitmq-server-generic-unix-$RABBITMQ_VERSION.tar.xz" - - RABBITMQ_TAR="rabbitmq-$RABBITMQ_VERSION.tar.xz" - -cache: - apt: true - directories: - - $HOME/.cache - -install: - - if [ ! -d "$HOME/.cache" ]; then mkdir "$HOME/.cache"; fi - - if [ -s "$HOME/.cache/$RABBITMQ_TAR" ]; then echo "[INFO] found cached $RABBITMQ_TAR file"; else wget -O "$HOME/.cache/$RABBITMQ_TAR" "$RABBITMQ_DOWNLOAD_URL"; fi - - tar -C "$TRAVIS_BUILD_DIR" -xf "$HOME/.cache/$RABBITMQ_TAR" - -before_script: - - /bin/sh -c "RABBITMQ_PID_FILE=$TRAVIS_BUILD_DIR/rabbitmq.pid $TRAVIS_BUILD_DIR/rabbitmq_server-$RABBITMQ_VERSION/sbin/rabbitmq-server &" - - /bin/sh "$TRAVIS_BUILD_DIR/rabbitmq_server-$RABBITMQ_VERSION/sbin/rabbitmqctl" wait "$TRAVIS_BUILD_DIR/rabbitmq.pid" - - /bin/sh "$TRAVIS_BUILD_DIR/rabbitmq_server-$RABBITMQ_VERSION/sbin/rabbitmqctl" status - -script: - # See https://github.com/travis-ci/travis-ci/issues/1066 and https://github.com/pika/pika/pull/984#issuecomment-370565220 - # as to why 'set -e' and 'set +e' are added here - - set -e - - /bin/sh "$TRAVIS_BUILD_DIR/build.sh" - - /bin/sh -c "RABBITMQ_RABBITMQCTL_PATH=$TRAVIS_BUILD_DIR/rabbitmq_server-$RABBITMQ_VERSION/sbin/rabbitmqctl $TRAVIS_BUILD_DIR/run-test.sh" - - set +e