Update ant and add internal CI for the action

Signed-off-by: Taylor Smock <smocktaylor@gmail.com>

Author: tsmock

.github/workflows/ant.yml

@@ -30,7 +30,7 @@ on:
         required: false
       ant-version:
         type: string
-        default: 'apache-ant-1.10.14'
+        default: 'apache-ant-1.10.15'
       perform-revision-tagging:
         type: boolean
         default: false
@@ -41,6 +41,21 @@ on:
         default: 0
         required: false
         description: "Set to an offset for automatic tagging. For example, if the last plugin version was 100, but there are only 20 commits, then this should be 80"
+      repository:
+        type: string
+        default: ${{ github.repository }}
+        required: false
+        description: "A variable used for developing the GitHub Action. See actions/checkout@v4."
+      ref:
+        type: string
+        default: ''
+        required: false
+        description: "A variable used for developing the GitHub Action. See actions/checkout@v4."
+      action_version:
+        type: string
+        default: 'v3'
+        required: false
+        description: "A variable used for developing the GitHub Action."
     outputs:
       tag:
         description: "The release tag"
@@ -66,7 +81,7 @@ jobs:
         distribution: ${{ inputs.java-distribution }}
         java-version: ${{ inputs.java-version }}
     - id: josm-build
-      uses: JOSM/JOSMPluginAction/actions/josm_build@v3
+      uses: JOSM/JOSMPluginAction/actions/josm_build@${{ inputs.action_version }}
       with:
         josm-revision: ${{ inputs.josm-revision }}
 
@@ -79,6 +94,8 @@ jobs:
         if: ${{ inputs.perform-revision-tagging }}
         with:
           fetch-depth: 0
+          repository: '${{ inputs.repository }}'
+          ref: '${{ inputs.ref }}'
       - name: Set revision env variable
         if: ${{ inputs.perform-revision-tagging }}
         id: create_revision
@@ -103,10 +120,10 @@ jobs:
         if [ -z "$(which svn)" ] && [ "${{ runner.os }}" == "Linux" ]; then
           sudo apt-get update && sudo apt-get install -y subversion
         fi
-    - uses: JOSM/JOSMPluginAction/actions/setup-ant@v3
+    - uses: JOSM/JOSMPluginAction/actions/setup-ant@${{ inputs.action_version }}
       with:
         ant-version: ${{ inputs.ant-version }}
-    - uses: JOSM/JOSMPluginAction/actions/plugin_clone@v3
+    - uses: JOSM/JOSMPluginAction/actions/plugin_clone@v${{ inputs.action_version }}
       with:
         java-distribution: ${{ inputs.java-distribution }}
         java-version: ${{ inputs.java-version }}
@@ -156,10 +173,10 @@ jobs:
         if [ -z "$(which svn)" ] && [ "${{ runner.os }}" == "Linux" ]; then
           sudo apt-get update && sudo apt-get install -y subversion
         fi
-    - uses: JOSM/JOSMPluginAction/actions/setup-ant@v3
+    - uses: JOSM/JOSMPluginAction/actions/setup-ant@${{ inputs.action_version }}
       with:
         ant-version: ${{ inputs.ant-version }}
-    - uses: JOSM/JOSMPluginAction/actions/plugin_clone@v3
+    - uses: JOSM/JOSMPluginAction/actions/plugin_clone@${{ inputs.action_version }}
       with:
         java-distribution: ${{ inputs.java-distribution }}
         java-version: ${{ inputs.java-version }}

.github/workflows/internal_ci.yml

@@ -0,0 +1,33 @@
+on:
+  push:
+    branches:
+      - master
+      - $default-branch
+      - $protected-branches
+  pull_request:
+    branches:
+      - master
+      - $default-branch
+  workflow_dispatch:
+
+permissions:
+  id-token: write
+  attestations: write
+  contents: write
+  packages: write
+
+jobs:
+  call-workflow-latest:
+    uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@${{ github_sha }}
+    with:
+      josm-revision: ""
+      java-version: 17
+  call-workflow-min:
+    uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@${{ github.sha }}
+    with:
+      josm-revision: "r19387"
+      java-version: 17
+      perform-revision-tagging: false
+      repository: 'JOSM/Mapillary'
+      ref: 'master'
+      action_version: ${{ github.sha }}

README.md

@@ -77,7 +77,7 @@ Use a specific java distribution for running the action. Defaults to `temurin`.
 ## Environment variables
 ### `ANT_HOME`
 This sets both the `ant` home, but do note that it is used to download the
-specified `ant` version. Defaults to `apache-ant-1.10.14`. You should generally
+specified `ant` version. Defaults to `apache-ant-1.10.15`. You should generally
 avoid changing this environment variable. Open a pull request first.
 
 # License

actions/setup-ant/action.yaml

@@ -2,7 +2,7 @@ name: "Ant setup"
 description: "Setup ant"
 inputs:
   ant-version:
-    default: 1.10.14
+    default: 1.10.15
     description: The version of ant to download and install
 outputs:
   ant-home:

actions/setup-ant/src/ant-setup.test.ts

@@ -34,15 +34,15 @@ describe("test downloadTool", () => {
     }
   });
 
-  test("1.10.14", async () => {
-    await downloadAntTool("1.10.14");
+  test("1.10.15", async () => {
+    await downloadAntTool("1.10.15");
     try {
       expect(coreAddPath).toBeCalledTimes(1);
       expect(coreAddPath).toBeCalledWith(
-        join(tempDir, "cache", "apache-ant", "1.10.14", process.arch, "bin"),
+        join(tempDir, "cache", "apache-ant", "1.10.15", process.arch, "bin"),
       );
     } finally {
-      await rmRF("1.10.14");
+      await rmRF("1.10.15");
     }
   }, 15_000);
 });