From 402411fb191e44600502333568899f58b3f44e74 Mon Sep 17 00:00:00 2001 From: tvaron3 Date: Thu, 21 Nov 2024 12:54:00 -0800 Subject: [PATCH 1/3] Check integration tests --- .github/workflows/mavenCI.yml | 1 - .github/workflows/release.yml | 5 +++-- src/docker/startup.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/mavenCI.yml b/.github/workflows/mavenCI.yml index f8e928b3..ed9cd161 100644 --- a/.github/workflows/mavenCI.yml +++ b/.github/workflows/mavenCI.yml @@ -29,7 +29,6 @@ jobs: - name: Run Integration Test shell: pwsh run: ./src/docker/startup.ps1 - if: github.ref == 'refs/heads/main' - name: Upload JaCoCo coverage report uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index af35b7ca..25fa799c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,10 +28,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: 'zulu' java-version: 11 - name: Get java-version id: get-version diff --git a/src/docker/startup.sh b/src/docker/startup.sh index 6fe0220e..c90d9982 100755 --- a/src/docker/startup.sh +++ b/src/docker/startup.sh @@ -1,6 +1,6 @@ #!/bin/bash echo "Shutting down Docker Compose orchestration..." -docker-compose down +docker compose down echo "Deleting prior Cosmos DB connectors..." rm -rf connectors @@ -24,4 +24,4 @@ echo "Building Cosmos DB Kafka Connect Docker image" docker build . -t cosmosdb-kafka-connect:latest echo "Starting Docker Compose..." -docker-compose up -d +docker compose up -d From c25ce33b20df3dbc34a99c04db938e2fc3892586 Mon Sep 17 00:00:00 2001 From: tvaron3 Date: Thu, 21 Nov 2024 13:03:18 -0800 Subject: [PATCH 2/3] Check integration tests --- src/docker/startup.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/docker/startup.ps1 b/src/docker/startup.ps1 index 210452c2..fe910228 100644 --- a/src/docker/startup.ps1 +++ b/src/docker/startup.ps1 @@ -2,7 +2,7 @@ $ErrorActionPreference='Stop' cd $PSScriptRoot Write-Host "Shutting down Docker Compose orchestration..." -docker-compose down +docker compose down Write-Host "Deleting prior Cosmos DB connectors..." rm -rf "$PSScriptRoot/connectors" @@ -26,4 +26,4 @@ Write-Host "Building Cosmos DB Kafka Connect Docker image" docker build . -t cosmosdb-kafka-connect:latest Write-Host "Starting Docker Compose..." -docker-compose up -d +docker compose up -d From 97a0191e779bf04ebfb98891a4f01444e5e11935 Mon Sep 17 00:00:00 2001 From: tvaron3 Date: Thu, 21 Nov 2024 13:09:54 -0800 Subject: [PATCH 3/3] revert enabling the integration test --- .github/workflows/mavenCI.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/mavenCI.yml b/.github/workflows/mavenCI.yml index ed9cd161..f8e928b3 100644 --- a/.github/workflows/mavenCI.yml +++ b/.github/workflows/mavenCI.yml @@ -29,6 +29,7 @@ jobs: - name: Run Integration Test shell: pwsh run: ./src/docker/startup.ps1 + if: github.ref == 'refs/heads/main' - name: Upload JaCoCo coverage report uses: actions/upload-artifact@v3 with: