From c4b90dfa754da4f39ebbc4b653345bd2cd7d160f Mon Sep 17 00:00:00 2001 From: Oguzhan Ozdemir Date: Tue, 17 Aug 2021 09:59:56 +0300 Subject: [PATCH 1/3] Add github workflow for build with Thundra integration --- .github/workflows/build.yml | 36 ++++++++++++++++++++++++++++++++++++ README.md | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..dcf6576 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,36 @@ +name: Maven Run for Production Environment + +on: + push: + branches: + - "master" + pull_request: + branches: + - "master" + workflow_dispatch: + +jobs: + build: + name: Build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 8 + uses: actions/setup-java@v2 + with: + distribution: "adopt" + java-version: "8" + - name: Start Docker containers + run: | + set -e + mvn -q -DskipTests test + nohup docker pull localstack/localstack-light > /dev/null & + nohup docker pull lambci/lambda:java8 > /dev/null & + - name: Thundra Maven Test Instrumentation Action + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} + uses: thundra-io/thundra-maven-test-action@v1 + with: + apikey: ${{ secrets.THUNDRA_API_KEY }} + project_id: ${{ secrets.THUNDRA_PROJECT_ID }} + - name: Run Tests + run: make test diff --git a/README.md b/README.md index 1e11cca..9d95241 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Build Status](https://travis-ci.com/localstack/localstack-java-utils.svg)](https://travis-ci.com/localstack/localstack-java-utils) [![Maven Central](https://img.shields.io/maven-central/v/cloud.localstack/localstack-utils)](https://mvnrepository.com/artifact/cloud.localstack/localstack-utils) - +[![Thundra Foresight](https://thundra-assets-prod.s3.us-west-2.amazonaws.com/images/badges/thundra-foresight-badge-enabled.svg)](https://foresight.thundra.live/testRuns/71e743a6-b8d5-4d55-aa89-5299f3c3d08e) # LocalStack Java Utils Java utilities and JUnit integration for [LocalStack](https://github.com/localstack/localstack). From cdfa08a1b280aeada0f94d7c9058d8527d0003e5 Mon Sep 17 00:00:00 2001 From: Oguzhan Ozdemir Date: Tue, 17 Aug 2021 13:19:11 +0300 Subject: [PATCH 2/3] Add temporary secrets for testing --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dcf6576..1fa3cd9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,9 @@ jobs: if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} uses: thundra-io/thundra-maven-test-action@v1 with: - apikey: ${{ secrets.THUNDRA_API_KEY }} - project_id: ${{ secrets.THUNDRA_PROJECT_ID }} + apikey: ${{ secrets.THUNDRA_DEMO_ACCOUNT_LOCALSTACK_APIKEY }} + project_id: ${{ secrets.THUNDRA_DEMO_ACCOUNT_LOCALSTACK_PROJECTID }} - name: Run Tests run: make test + env: + THUNDRA_AGENT_REPORT_REST_BASEURL: https://collector.thundra.us/v1 From 6db59cbf4e117f56646a2d1c321a26305d68c8d7 Mon Sep 17 00:00:00 2001 From: Oguzhan Ozdemir Date: Tue, 17 Aug 2021 13:25:21 +0300 Subject: [PATCH 3/3] Update workflow --- .github/workflows/build.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1fa3cd9..d9cec2f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Maven Run for Production Environment +name: CI on: push: @@ -20,12 +20,17 @@ jobs: with: distribution: "adopt" java-version: "8" - - name: Start Docker containers + - name: Pull Docker containers run: | set -e - mvn -q -DskipTests test nohup docker pull localstack/localstack-light > /dev/null & nohup docker pull lambci/lambda:java8 > /dev/null & + nohup docker pull localstack/localstack > /dev/null & + - name: Compile Tests + run: | + set -e + make compile + MVN_TEST_ARGS="-q -DskipTests" make test - name: Thundra Maven Test Instrumentation Action if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} uses: thundra-io/thundra-maven-test-action@v1