From 83f8997e33fbaad449863b7c992f61b32af594ae Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 23 Jun 2026 22:17:25 -0700 Subject: [PATCH 1/3] Update GitHub actions to latest versions --- .github/workflows/bld.yml | 6 +++--- .github/workflows/pages.yml | 4 ++-- .github/workflows/publish.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index 9d11b55..d815308 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -94,7 +94,7 @@ jobs: steps: - name: Checkout source repository - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: clean: true submodules: 'true' @@ -143,7 +143,7 @@ jobs: steps: - name: Checkout source repository - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: clean: true submodules: 'true' @@ -190,7 +190,7 @@ jobs: run: git config --global core.autocrlf input - name: Checkout source repository - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: clean: true submodules: 'true' diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 1679e89..d68a3a2 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout source repository - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: clean: true submodules: 'true' @@ -57,4 +57,4 @@ jobs: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v5 \ No newline at end of file + uses: actions/deploy-pages@v5 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 06905a1..cc2a94f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,7 +9,7 @@ jobs: steps: - name: Checkout source repository - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: fetch-depth: 0 From cd545df7303352832b0d82e3bdda84b187c1ae5c Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 23 Jun 2026 22:37:51 -0700 Subject: [PATCH 2/3] Remove `download` CI workflow step, no longer needed when using `autoDownloadPurge` and caching --- .github/workflows/bld.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index d815308..eef7857 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -115,11 +115,8 @@ jobs: key: ${{ runner.os }}-bld-java${{ matrix.java-version}}-lib restore-keys: ${{ runner.os }}-bld-java${{ matrix.java-version}}-lib - - name: Download dependencies - run: ./bld clean download - - name: Compile source - run: ./bld compile + run: ./bld clean compile - name: Run tests id: tests From 462e8fc10a0f391e0c9a6dd70115d4f89619504a Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 23 Jun 2026 22:41:44 -0700 Subject: [PATCH 3/3] Use `Product` user-agent standardized formatting --- core | 2 +- src/main/java/rife/bld/dependencies/ArtifactRetriever.java | 4 +++- src/main/java/rife/bld/wrapper/Wrapper.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core b/core index fa56772..5f97763 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit fa567721c00d99626ed439db4f0340eadff0ec03 +Subproject commit 5f977636531d1b978b762a615d720097baa37830 diff --git a/src/main/java/rife/bld/dependencies/ArtifactRetriever.java b/src/main/java/rife/bld/dependencies/ArtifactRetriever.java index 7364fac..ac98ebd 100644 --- a/src/main/java/rife/bld/dependencies/ArtifactRetriever.java +++ b/src/main/java/rife/bld/dependencies/ArtifactRetriever.java @@ -6,6 +6,8 @@ package rife.bld.dependencies; import rife.bld.BldVersion; import rife.tools.FileUtils; +import rife.tools.HttpUtils; +import rife.tools.Product; import rife.tools.exceptions.FileUtilsErrorException; import java.io.File; @@ -191,7 +193,7 @@ public abstract class ArtifactRetriever { private static URLConnection openUrlConnection(RepositoryArtifact artifact) throws IOException { var connection = new URL(artifact.location()).openConnection(); connection.setUseCaches(false); - connection.setRequestProperty("User-Agent", "bld " + BldVersion.getVersion()); + connection.setRequestProperty(HttpUtils.HEADER_USER_AGENT, Product.BLD.toUserAgent(BldVersion.getVersion())); return connection; } diff --git a/src/main/java/rife/bld/wrapper/Wrapper.java b/src/main/java/rife/bld/wrapper/Wrapper.java index 3164b5d..bf2c939 100644 --- a/src/main/java/rife/bld/wrapper/Wrapper.java +++ b/src/main/java/rife/bld/wrapper/Wrapper.java @@ -830,7 +830,7 @@ public class Wrapper { throws IOException { var connection = url.openConnection(); connection.setUseCaches(false); - connection.setRequestProperty("User-Agent", "bld " + version); + connection.setRequestProperty(HttpUtils.HEADER_USER_AGENT, Product.BLD.toUserAgent(version)); try (var in = connection.getInputStream()) { return new String(in.readAllBytes(), StandardCharsets.UTF_8); }