diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1b0b724e8fe..250af85d7d9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -283,9 +283,7 @@ jobs: submodules: 'false' show-progress: 'false' - name: Install JBang - run: | - curl -Ls https://sh.jbang.dev | bash -s - app setup - echo "$HOME/.jbang/bin" >> $GITHUB_PATH + uses: jbangdev/setup-jbang@main - run: jbang build .jbang/CheckoutPR.java - run: jbang build .jbang/CloneJabRef.java - run: jbang build .jbang/JabKitLauncher.java diff --git a/.jbang/CheckoutPR.java b/.jbang/CheckoutPR.java index 32c93aba7f1..81c18d374cd 100644 --- a/.jbang/CheckoutPR.java +++ b/.jbang/CheckoutPR.java @@ -75,6 +75,8 @@ public static void main(String[] args) throws Exception { pr = repo.getPullRequest(prNumber); } + System.out.println("Determined PR URL is " + pr.getUrl()); + if (pr.isMerged()) { System.out.println("Pull request is already merged - checking out main branch..."); checkoutUpstreamMain(); @@ -144,7 +146,8 @@ public static void main(String[] args) throws Exception { .call(); } - System.out.println("Checked out PR #" + pr.getNumber() + " (" + pr.getTitle() + ") to branch '" + localBranchName + "'."); + System.out.println("Checked out PR #" + pr.getNumber() + " (" + pr.getTitle() + ") to branch " + localBranchName + "."); + System.out.println("Checked out commit " + pr.getHead().getSha() + "."); } private static void checkoutUpstreamMain() throws Exception { diff --git a/justfile b/justfile index edf80398933..03e756b17a4 100644 --- a/justfile +++ b/justfile @@ -46,6 +46,9 @@ run-jabkit *FLAGS: run-jabsrv *FLAGS: .\gg.cmd gradle :jabsrv-cli:run --args="{{FLAGS}}" +run-main: + just run main + run-pr pr-id: just checkout-pr {{pr-id}} just run-gui