From 98d68eb8f137eda5a62aa89cb84beda7170dc61b Mon Sep 17 00:00:00 2001 From: banderous Date: Thu, 1 May 2025 10:33:47 +0100 Subject: [PATCH 1/4] Create ado_artifacts_build.yml --- .github/workflows/ado_artifacts_build.yml | 33 +++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/ado_artifacts_build.yml diff --git a/.github/workflows/ado_artifacts_build.yml b/.github/workflows/ado_artifacts_build.yml new file mode 100644 index 00000000..c208ad05 --- /dev/null +++ b/.github/workflows/ado_artifacts_build.yml @@ -0,0 +1,33 @@ +name: Publish to Azure Artifacts + +on: + workflow_dispatch: + push: + tags: + - '*' + +jobs: + PublishToAzureArtifacts: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 17 + cache: 'gradle' + + - name: Publish to Azure DevOps Artifacts + run: | + ./gradlew publish + env: + AZURE_DEVOPS_ARTIFACT_USERNAME: ${{ secrets.AZURE_DEVOPS_ARTIFACT_USERNAME }} + AZURE_DEVOPS_ARTIFACT_TOKEN: ${{ secrets.AZURE_DEVOPS_ARTIFACT_TOKEN }} + RELEASE_VERSION: ${{ github.ref_name }} + shell: bash From 7df36a8a63d854ea969aa6f56b03d5af2f99a63a Mon Sep 17 00:00:00 2001 From: Alex McAusland Date: Thu, 1 May 2025 10:38:31 +0100 Subject: [PATCH 2/4] buildno --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a813f854..72745dcd 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'com.github.ben-manes.versions' version '0.52.0' } -def buildNumber = System.getenv("RELEASE_VERSION")?.replace("refs/tags/", "") ?: "DEV-SNAPSHOT" +def buildNumber = System.getenv("RELEASE_VERSION")?: "DEV-SNAPSHOT" allprojects { group 'com.github.hmcts.java-logging' From a0bbfff6b1a6692fbeaeb94a654736075dd4f7aa Mon Sep 17 00:00:00 2001 From: Alex McAusland Date: Thu, 1 May 2025 10:44:16 +0100 Subject: [PATCH 3/4] publish --- build.gradle | 11 +++++++++++ java-logging-appinsights/build.gradle | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/build.gradle b/build.gradle index 72745dcd..49dbe3c5 100644 --- a/build.gradle +++ b/build.gradle @@ -109,6 +109,17 @@ publishing { version project.version } } + + repositories { + maven { + name = "AzureArtifacts" + url = uri("https://pkgs.dev.azure.com/hmcts/Artifacts/_packaging/hmcts-lib/maven/v1") + credentials { + username = System.getenv("AZURE_DEVOPS_ARTIFACT_USERNAME") + password = System.getenv("AZURE_DEVOPS_ARTIFACT_TOKEN") + } + } + } } dependencies { diff --git a/java-logging-appinsights/build.gradle b/java-logging-appinsights/build.gradle index afb46b59..e8632ed3 100644 --- a/java-logging-appinsights/build.gradle +++ b/java-logging-appinsights/build.gradle @@ -21,6 +21,17 @@ publishing { version project.version } } + + repositories { + maven { + name = "AzureArtifacts" + url = uri("https://pkgs.dev.azure.com/hmcts/Artifacts/_packaging/hmcts-lib/maven/v1") + credentials { + username = System.getenv("AZURE_DEVOPS_ARTIFACT_USERNAME") + password = System.getenv("AZURE_DEVOPS_ARTIFACT_TOKEN") + } + } + } } repositories { From 251c067388f2dd9f4a213ffccf0cfb3eb3e94e96 Mon Sep 17 00:00:00 2001 From: Alex McAusland Date: Thu, 1 May 2025 10:56:33 +0100 Subject: [PATCH 4/4] replace jitpack --- .github/workflows/jitpack_build.yml | 41 ----------------------------- README.md | 9 +++++-- java-logging-appinsights/README.md | 6 +++-- 3 files changed, 11 insertions(+), 45 deletions(-) delete mode 100644 .github/workflows/jitpack_build.yml diff --git a/.github/workflows/jitpack_build.yml b/.github/workflows/jitpack_build.yml deleted file mode 100644 index 90a2b973..00000000 --- a/.github/workflows/jitpack_build.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Trigger JitPack Build - -on: - push: - tags: - - '*' - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - name: Trigger Build in JitPack - run: | - echo "Triggering JitPack build" - - PACKAGES_URL="https://jitpack.io/com/github/${GITHUB_REPOSITORY}/${GITHUB_REF#refs/tags/}/" - PACKAGES_FILE="packages.txt" - touch ${PACKAGES_FILE} - # Try the URL 6 times before failing - count=1 - until [[ $count -gt 6 ]] || grep -q build.log ${PACKAGES_FILE} ; do - echo "Attempt ${count}/6" - STATUS=$(curl -s -o packages.txt -w "%{http_code}" --max-time 900 ${PACKAGES_URL}) - - let count+=1 - if [[ "${STATUS}" -gt 399 ]]; then - sleep 30 - fi - done - - echo "::group::Files Available" - echo $(cat ${PACKAGES_FILE}) - echo "::endgroup::" - - if [[ ${STATUS} -gt 399 ]] ; then - echo "FAILURE: ${STATUS} response from JitPack" - exit 1 - fi diff --git a/README.md b/README.md index cf53058c..0d06d312 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ [![GitHub version](https://badge.fury.io/gh/hmcts%2Fjava-logging.svg)](https://badge.fury.io/gh/hmcts%2Fjava-logging) -[![JitPack Badge](https://github.com/hmcts/java-logging/actions/workflows/jitpack_build.yml/badge.svg)](https://github.com/hmcts/java-logging/actions/workflows/jitpack_build.yml) [![Known Vulnerabilities](https://snyk.io/test/github/hmcts/java-logging/badge.svg)](https://snyk.io/test/github/hmcts/java-logging) # Java logging @@ -22,7 +21,13 @@ Simply add base component as your project's dependency and then one or more of t Base component dependency, gradle: ```groovy -implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: '6.1.2' +repositories { + maven { + url 'https://pkgs.dev.azure.com/hmcts/Artifacts/_packaging/hmcts-lib/maven/v1' + } +} + +implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: 'LATEST_TAG' ``` #### java-logging-insights diff --git a/java-logging-appinsights/README.md b/java-logging-appinsights/README.md index 2366bf53..2335961c 100644 --- a/java-logging-appinsights/README.md +++ b/java-logging-appinsights/README.md @@ -14,11 +14,13 @@ Gradle: ```groovy repositories { - maven { url 'https://jitpack.io' } + maven { + url 'https://pkgs.dev.azure.com/hmcts/Artifacts/_packaging/hmcts-lib/maven/v1' + } } dependencies { - implementation group: 'com.github.hmcts.java-logging', name: 'logging-appinsights', version: '6.1.8' + implementation group: 'com.github.hmcts.java-logging', name: 'logging-appinsights', version: 'LATEST_TAG' } ```