From 59ddd3a5ff6512ac5404ee92fa4f1c2046e5b822 Mon Sep 17 00:00:00 2001 From: Akira KAWAGUCHI Date: Sun, 24 Sep 2023 21:22:09 +0900 Subject: [PATCH 1/2] Migrate com.tsurugidb dependencies to Maven Central --- .github/workflows/ci-build.yml | 2 -- java/cost-accounting-benchmark/build.gradle | 12 ++---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index f571a77..b37b9c5 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -27,8 +27,6 @@ jobs: working-directory: java/cost-accounting-benchmark env: JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 - GPR_USER: ${{ github.repository_owner }} - GPR_KEY: ${{ secrets.GHCR_PAT }} steps: - name: Setup_Java diff --git a/java/cost-accounting-benchmark/build.gradle b/java/cost-accounting-benchmark/build.gradle index 4b70894..21a9194 100755 --- a/java/cost-accounting-benchmark/build.gradle +++ b/java/cost-accounting-benchmark/build.gradle @@ -12,24 +12,16 @@ if (hasProperty('mavenLocal')) { } else { repositories { maven { - url 'https://maven.pkg.github.com/project-tsurugi/*' + url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' content { includeGroupByRegex 'com\\.tsurugidb.*' } - credentials { - username findProperty('gpr.user') ?: System.getenv('GPR_USER') - password findProperty('gpr.key') ?: System.getenv('GPR_KEY') - } } } } repositories { - mavenCentral { - content { - excludeGroupByRegex 'com\\.tsurugidb.*' - } - } + mavenCentral() } configurations.all { From 61fd17ab830d4b715d5aa9d2ad8b14d467b5d115 Mon Sep 17 00:00:00 2001 From: Akira KAWAGUCHI Date: Sun, 24 Sep 2023 21:23:03 +0900 Subject: [PATCH 2/2] Modify CI to use hosted runner --- .github/workflows/ci-build.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index b37b9c5..aa8719c 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -10,17 +10,10 @@ on: jobs: Build: - runs-on: [self-hosted, docker] + runs-on: ubuntu-latest permissions: checks: write timeout-minutes: 30 - container: - image: ghcr.io/project-tsurugi/oltp-sandbox:latest - credentials: - username: ${{ github.repository_owner }} - password: ${{ secrets.GHCR_PAT }} - volumes: - - ${{ vars.gradle_cache_dir }}:/root/.gradle defaults: run: shell: bash