diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 0bdd7a8e2..bfae06155 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -30,6 +30,17 @@ jobs: # Force Mesa's software rasterizer - GitHub-hosted runners have no GPU, and LWJGL/GLFW # need a working GL context (even offscreen) to boot the Minecraft client for gametests. LIBGL_ALWAYS_SOFTWARE: "1" + # build.gradle.kts reads github_actor/github_token from the environment (GITHUB_ACTOR/GITHUB_TOKEN) + # for Basic Auth against the MrCrayfish GitHub Packages Maven repo (catalogue/menulogue). + # GITHUB_ACTOR is provided by the runner, but GITHUB_TOKEN is only available via expressions + # unless explicitly exported to the step environment, so Gradle runs need it set here. + # Packages 401s, even for a public package. Note this may still not be sufficient on its + # own: secrets.GITHUB_TOKEN is scoped to this repo, and cross-owner GitHub Packages reads + # commonly need a real PAT (with read:packages) that's been granted access to MrCrayfish's + # packages specifically - if this repo's actor/token combination still 401s, that's the + # next thing to check, likely needing a dedicated PAT secret instead. + GITHUB_ACTOR: ${{ github.actor }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v7 diff --git a/Archie-Test/build.gradle.kts b/Archie-Test/build.gradle.kts index adf091728..d755833ba 100644 --- a/Archie-Test/build.gradle.kts +++ b/Archie-Test/build.gradle.kts @@ -64,6 +64,12 @@ subprojects { val githubToken = "github_token".localOrEnv mavenCentral() mavenLocal() + google { + content { + includeGroupByRegex("androidx\\..*") + includeGroupByRegex("com\\.android.*") + } + } maven { name = "kernelpanic releases" url = uri("https://maven.kernelpanicsoft.net/releases") @@ -81,7 +87,11 @@ subprojects { maven("https://maven.isxander.dev/releases") { name = "Xander Maven" } - maven("https://maven.resourcefulbees.com/repository/maven-public/") + maven("https://maven.resourcefulbees.com/repository/maven-public/") { + content { + includeGroup("earth.terrarium.common_storage_lib") + } + } maven { url = uri("https://maven.pkg.github.com/MrCrayfish/Maven") credentials { diff --git a/Archie/build.gradle.kts b/Archie/build.gradle.kts index 6890738f9..15c3d1a98 100644 --- a/Archie/build.gradle.kts +++ b/Archie/build.gradle.kts @@ -69,6 +69,12 @@ subprojects { val githubToken = "github_token".localOrEnv mavenCentral() mavenLocal() + google { + content { + includeGroupByRegex("androidx\\..*") + includeGroupByRegex("com\\.android.*") + } + } maven { name = "kernelpanic releases" url = uri("https://maven.kernelpanicsoft.net/releases") @@ -87,7 +93,11 @@ subprojects { maven("https://maven.isxander.dev/releases") { name = "Xander Maven" } - maven("https://maven.resourcefulbees.com/repository/maven-public/") + maven("https://maven.resourcefulbees.com/repository/maven-public/") { + content { + includeGroup("earth.terrarium.common_storage_lib") + } + } maven { url = uri("https://maven.pkg.github.com/MrCrayfish/Maven") credentials {