From f729b06aec11655f8c8154eeef02511557535ff6 Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Wed, 25 Jun 2025 17:57:55 -0400 Subject: [PATCH] build: update to use new repositories --- .github/CODEOWNERS | 2 -- .github/workflows/pr-build.yml | 16 ++-------------- .github/workflows/publish.yml | 22 +++++----------------- README.md | 2 -- build.gradle.kts | 6 +++--- settings.gradle.kts | 4 ++-- 6 files changed, 12 insertions(+), 40 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ed77225..9d0f551 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -3,5 +3,3 @@ # global * @hypertrace/build-tooling -# GH action -.github/ @aaron-steinfeld @jbahire @kotharironak @buchi-busireddy diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 451e44b..0108508 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -9,28 +9,16 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation - name: Check out code - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4 with: ref: ${{github.event.pull_request.head.ref}} repository: ${{github.event.pull_request.head.repo.full_name}} fetch-depth: 0 - - name: create checksum file - uses: hypertrace/github-actions/checksum@main - - - name: Cache packages - uses: actions/cache@v2 - with: - path: ~/.gradle - key: gradle-packages-${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/checksum.txt') }} - restore-keys: | - gradle-packages-${{ runner.os }}-${{ github.job }} - gradle-packages-${{ runner.os }} - - name: Build with Gradle uses: hypertrace/github-actions/gradle@main with: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 02d3c75..819277c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,31 +8,19 @@ on: jobs: publish-artifacts: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation - name: Check out code - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: create checksum file - uses: hypertrace/github-actions/checksum@main - - - name: Cache packages - uses: actions/cache@v2 - with: - path: ~/.gradle - key: gradle-packages-${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/checksum.txt') }} - restore-keys: | - gradle-packages-${{ runner.os }}-${{ github.job }} - gradle-packages-${{ runner.os }} - - name: publish java artifacts uses: hypertrace/github-actions/gradle@main with: args: publish env: - ORG_GRADLE_PROJECT_artifactory_contextUrl: ${{ secrets.ARTIFACTORY_CONTEXT_URL }} - ORG_GRADLE_PROJECT_artifactory_user: ${{ secrets.ARTIFACTORY_PUBLISH_USER }} - ORG_GRADLE_PROJECT_artifactory_password: ${{ secrets.ARTIFACTORY_PUBLISH_TOKEN }} + ORG_GRADLE_PROJECT_maven_repo_url: ${{ secrets.HAR_REPO_URL }} + ORG_GRADLE_PROJECT_maven_user: ${{ secrets.HAR_PUBLISH_USER }} + ORG_GRADLE_PROJECT_maven_password: ${{ secrets.HAR_PUBLISH_TOKEN }} \ No newline at end of file diff --git a/README.md b/README.md index fc10027..f24f9f4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ # Hypertrace Gradle Docker Plugins -[![CircleCI](https://circleci.com/gh/hypertrace/hypertrace-gradle-docker-plugins.svg?style=svg)](https://circleci.com/gh/hypertrace/hypertrace-gradle-docker-plugins) - A collection of plugins for working with docker in gradle using the Hypertrace conventions, including publishing to the Hypertrace docker repository. See individual plugin READMEs for more details. diff --git a/build.gradle.kts b/build.gradle.kts index cd1ef23..6ef54b1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,9 +2,9 @@ import org.hypertrace.gradle.publishing.HypertracePublishExtension import org.hypertrace.gradle.publishing.License plugins { - id("org.hypertrace.ci-utils-plugin") version "0.3.0" - id("org.hypertrace.publish-plugin") version "1.0.4" apply false - id("org.hypertrace.repository-plugin") version "0.4.0" + id("org.hypertrace.ci-utils-plugin") version "0.4.0" + id("org.hypertrace.publish-plugin") version "1.1.1" apply false + id("org.hypertrace.repository-plugin") version "0.5.0" } subprojects { diff --git a/settings.gradle.kts b/settings.gradle.kts index 947395b..db63b93 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,12 +2,12 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() - maven("https://hypertrace.jfrog.io/artifactory/maven") + maven("https://us-maven.pkg.dev/hypertrace-repos/maven") } } plugins { - id("org.hypertrace.version-settings") version "0.2.0" + id("org.hypertrace.version-settings") version "0.3.0" } rootProject.name = "hypertrace-gradle-docker-plugins"