From a41f0411cda5480db7aed8ee0e622ca301f8246d Mon Sep 17 00:00:00 2001 From: jkao97 Date: Tue, 20 Feb 2024 10:40:18 -0800 Subject: [PATCH 1/3] testing: remove source + conditional pip --- .semaphore/semaphore.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 2825489944..ede190171c 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -37,9 +37,9 @@ blocks: jobs: - name: Test commands: - - pip install confluent-release-tools -q - - . sem-pint -c - - . ci-tools ci-update-version + - if [[ "${SEMAPHORE_ORGANIZATION_URL}" == *".semaphoreci.com" ]]; then pip install confluent-release-tools -q; fi + - sem-pint -c + - ci-tools ci-update-version - mvn -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode --no-transfer-progress clean verify install dependency:analyze validate - . cache-maven store epilogue: From f163c40f3a77f6f40334bf319a41b9cd7d778ee2 Mon Sep 17 00:00:00 2001 From: jkao97 Date: Tue, 20 Feb 2024 10:48:10 -0800 Subject: [PATCH 2/3] Update semaphore.yml --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index ede190171c..e73fe2020b 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -37,7 +37,7 @@ blocks: jobs: - name: Test commands: - - if [[ "${SEMAPHORE_ORGANIZATION_URL}" == *".semaphoreci.com" ]]; then pip install confluent-release-tools -q; fi + - if [[ "${SEMAPHORE_ORGANIZATION_URL}" != *".semaphoreci.com" ]]; then pip install confluent-release-tools -q; fi - sem-pint -c - ci-tools ci-update-version - mvn -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode --no-transfer-progress clean verify install dependency:analyze validate From 06098ef24da621c8f9fcacd0d6b08b7a393de53d Mon Sep 17 00:00:00 2001 From: jkao97 Date: Tue, 20 Feb 2024 13:29:50 -0800 Subject: [PATCH 3/3] Update semaphore.yml --- .semaphore/semaphore.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index e73fe2020b..a60ed11e90 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -7,7 +7,7 @@ version: v1.0 name: build-test-release agent: machine: - type: s1-prod-ubuntu20-04-amd64-1 + type: s1-nonprod-ubuntu20-04-amd64-1 fail_fast: cancel: @@ -37,8 +37,7 @@ blocks: jobs: - name: Test commands: - - if [[ "${SEMAPHORE_ORGANIZATION_URL}" != *".semaphoreci.com" ]]; then pip install confluent-release-tools -q; fi - - sem-pint -c + - . sem-pint -c - ci-tools ci-update-version - mvn -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode --no-transfer-progress clean verify install dependency:analyze validate - . cache-maven store @@ -57,8 +56,8 @@ blocks: jobs: - name: Release commands: - - . ci-tools ci-update-version - - . ci-tools ci-push-tag + - ci-tools ci-update-version + - ci-tools ci-push-tag - mvn -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode -DaltDeploymentRepository=confluent-codeartifact-internal::default::https://confluent-519856050701.d.codeartifact.us-west-2.amazonaws.com/maven/maven-snapshots/ -DrepositoryId=confluent-codeartifact-internal deploy -DskipTests