From 0efb8b8d8dbd3b4a16aac053ce0c1b8f9fe06b9c Mon Sep 17 00:00:00 2001 From: Mashiro <107276926+mashiro-san@users.noreply.github.com> Date: Mon, 15 Jan 2024 11:00:56 +0000 Subject: [PATCH 1/2] Update repository files --- .github/workflows/dependabot.yml | 2 +- .github/workflows/stale.yml | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml index db87bb97..f4936a92 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/dependabot.yml @@ -4,4 +4,4 @@ on: [pull_request_target] jobs: dependabot: name: Dependabot[bot] - uses: Katsute/Workflows/.github/workflows/dependabot.yml@main \ No newline at end of file + uses: KatsuteDev/Workflows/.github/workflows/dependabot.yml@main \ No newline at end of file diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index f4767a38..add3eb03 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -12,7 +12,6 @@ on: jobs: stale: name: Stale - uses: Katsute/Workflows/.github/workflows/stale.yml@main - if: github.repository_owner == 'Katsute' || github.repository_owner == 'KatsuteDev' - secrets: - token: ${{ secrets.BOT }} \ No newline at end of file + uses: KatsuteDev/Workflows/.github/workflows/stale.yml@main + if: github.repository_owner == 'KatsuteDev' + secrets: inherit \ No newline at end of file From fbb0974b41c28acfec177c096642e836760f2a75 Mon Sep 17 00:00:00 2001 From: Katsute <58778985+Katsute@users.noreply.github.com> Date: Mon, 15 Jan 2024 14:02:41 -0500 Subject: [PATCH 2/2] update workflows --- .github/workflows/{java_ci.yml => ci.yml} | 7 ++----- .github/workflows/{manager.yml => kdevbot.yml} | 16 ++++++---------- .github/workflows/mta_ci.yml | 6 +++--- .github/workflows/release.yml | 9 ++------- 4 files changed, 13 insertions(+), 25 deletions(-) rename .github/workflows/{java_ci.yml => ci.yml} (59%) rename .github/workflows/{manager.yml => kdevbot.yml} (52%) diff --git a/.github/workflows/java_ci.yml b/.github/workflows/ci.yml similarity index 59% rename from .github/workflows/java_ci.yml rename to .github/workflows/ci.yml index 8715b66a..c24dfe03 100644 --- a/.github/workflows/java_ci.yml +++ b/.github/workflows/ci.yml @@ -11,9 +11,6 @@ on: jobs: java_ci: name: Java CI - uses: Katsute/Workflows/.github/workflows/java.ci.yml@main + uses: KatsuteDev/Workflows/.github/workflows/java.ci.yml@main with: - package: true - report: true - secrets: - token: ${{ secrets.BOT }} \ No newline at end of file + package: true \ No newline at end of file diff --git a/.github/workflows/manager.yml b/.github/workflows/kdevbot.yml similarity index 52% rename from .github/workflows/manager.yml rename to .github/workflows/kdevbot.yml index e845ed92..579ac5ea 100644 --- a/.github/workflows/manager.yml +++ b/.github/workflows/kdevbot.yml @@ -1,4 +1,4 @@ -name: Repository Manager +name: kdevbot[bot] on: workflow_dispatch: schedule: @@ -16,14 +16,10 @@ on: types: [published] jobs: - manager: - name: Repository Manager - uses: Katsute/Workflows/.github/workflows/manager.yml@main + kdevbot: + name: kdevbot[bot] + uses: KatsuteDev/kdevbot/.github/workflows/kdevbot.yml@main if: >- - ${{ - (github.repository_owner == 'Katsute' || github.repository_owner == 'KatsuteDev') && - github.actor != 'mashiro-san' && + github.repository_owner == 'KatsuteDev' && !endsWith(github.actor, '[bot]') - }} - secrets: - token: ${{ secrets.BOT }} \ No newline at end of file + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/mta_ci.yml b/.github/workflows/mta_ci.yml index d9a0f8ed..3dfd30fa 100644 --- a/.github/workflows/mta_ci.yml +++ b/.github/workflows/mta_ci.yml @@ -34,15 +34,15 @@ jobs: run: mkdir -p "src/test/java/resources" - name: Load Client ID - run: | + run: |- echo ${{ secrets.BUS_TOKEN }} > src/test/java/resources/bus.txt - name: Load OAuth Token - run: | + run: |- echo ${{ secrets.SUBWAY_TOKEN }} > src/test/java/resources/subway.txt - name: Load Test Group - run: | + run: |- echo ${{ matrix.group }} > src/test/java/resources/TEST_GROUP - name: Test with Maven diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 395b3e5b..48f73c0d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,12 +7,7 @@ on: jobs: deploy: name: Deploy - uses: Katsute/Workflows/.github/workflows/java.deploy.yml@main + uses: KatsuteDev/Workflows/.github/workflows/java.deploy.maven.yml@main with: environment: Maven Central - secrets: - token: ${{ secrets.GITHUB_TOKEN }} - maven-username: ${{ secrets.OSSRH_USERNAME }} - maven-password: ${{ secrets.OSSRH_TOKEN }} - gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} - gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }} \ No newline at end of file + secrets: inherit \ No newline at end of file