From 2f079de8c6093bbc4715d0306aabf6ff20dfa370 Mon Sep 17 00:00:00 2001 From: CoreyAudio Date: Thu, 2 Jul 2026 21:20:10 -0500 Subject: [PATCH 1/2] Make CI checkout fork-safe --- .github/workflows/gradle_build.yml | 8 ++++++-- build.gradle | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 9523766..a9a0f8f 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -6,20 +6,24 @@ on: pull_request: branches: [ master, dev ] +env: + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + jobs: build: runs-on: ubuntu-latest + steps: - name: Configure SSH for private submodules + if: env.SSH_PRIVATE_KEY != '' uses: webfactory/ssh-agent@v0.9.0 with: - ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + ssh-private-key: ${{ env.secrets.SSH_PRIVATE_KEY }} - name: Checkout code uses: actions/checkout@v4 with: submodules: recursive - repository: Botts-Innovative-Research/osh-android - name: Setup Java uses: actions/setup-java@v4 diff --git a/build.gradle b/build.gradle index c6d7eff..fce498b 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ subprojects { maven { url 'https://jitpack.io' } } - if (!project.projectDir.parent.endsWith('osh-android')) { + if (!project.projectDir.parent.endsWith('osh-android-corey')) { apply plugin: 'java-library' apply plugin: 'maven-publish' sourceCompatibility = JavaVersion.VERSION_17 From 61c9334e2a7ebc5f2060d82c9268ed4bf7ed8aea Mon Sep 17 00:00:00 2001 From: CoreyAudio Date: Thu, 2 Jul 2026 22:55:06 -0500 Subject: [PATCH 2/2] Fix workflow env reference and revert local path workaround --- .github/workflows/gradle_build.yml | 2 +- build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index a9a0f8f..58a7338 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -18,7 +18,7 @@ jobs: if: env.SSH_PRIVATE_KEY != '' uses: webfactory/ssh-agent@v0.9.0 with: - ssh-private-key: ${{ env.secrets.SSH_PRIVATE_KEY }} + ssh-private-key: ${{ env.SSH_PRIVATE_KEY }} - name: Checkout code uses: actions/checkout@v4 diff --git a/build.gradle b/build.gradle index fce498b..c6d7eff 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ subprojects { maven { url 'https://jitpack.io' } } - if (!project.projectDir.parent.endsWith('osh-android-corey')) { + if (!project.projectDir.parent.endsWith('osh-android')) { apply plugin: 'java-library' apply plugin: 'maven-publish' sourceCompatibility = JavaVersion.VERSION_17