From c93f8dadf95241e69c226bfe7c400819dcce668c Mon Sep 17 00:00:00 2001 From: Taylor Smock Date: Thu, 30 Jan 2025 05:51:27 -0700 Subject: [PATCH] Add pom and update github workflow for auto releases Signed-off-by: Taylor Smock --- .github/workflows/ant.yml | 22 ++++++++++++++++------ build.xml | 37 ++++++++++++++++++------------------- pom.xml | 23 +++++++++++++++++++++++ 3 files changed, 57 insertions(+), 25 deletions(-) create mode 100644 pom.xml diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index f83cad9..2fc0911 100644 --- a/.github/workflows/ant.yml +++ b/.github/workflows/ant.yml @@ -12,6 +12,13 @@ on: - $default-branch workflow_dispatch: +permissions: + id-token: write + attestations: write + contents: write + packages: write + checks: write + jobs: check-release-needed: runs-on: ubuntu-latest @@ -29,23 +36,26 @@ jobs: last_tag=$(git describe --tags --abbrev=0 --always) release_needed="false" for file in $(git diff ${last_tag}..HEAD --name-only); do - if [[ $file = "src/"* ]]; then + if [[ $file = "src/"* ]] || [[ $file = "data/*" ]] || [[ $file = "lib/*" ]] || [[ $file = "resources/*" ]] || [[ $file = "images/*" ]]; then release_needed="true" break fi done echo "release_needed=$release_needed" >> $GITHUB_OUTPUT - call-workflow: needs: check-release-needed strategy: matrix: josm-revision: ["", "r19044"] - uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@v2 + uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@v3 with: josm-revision: ${{ matrix.josm-revision }} - perform-revision-tagging: ${{ matrix.josm-revision == 'r19044' && needs.check-release-needed.outputs.release_needed == 'true' }} - plugin-jar-name: 'config' + perform-revision-tagging: ${{ github.repository == 'JOSM/configuration' && github.ref_type == 'branch' && github.ref_name == 'master' && github.event_name != 'schedule' && github.event_name != 'pull_request' && matrix.josm-revision == 'r19044' }} secrets: inherit - + permissions: + attestations: write + checks: write + contents: write + deployments: write + id-token: write diff --git a/build.xml b/build.xml index 5aaf947..407be71 100644 --- a/build.xml +++ b/build.xml @@ -1,22 +1,21 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..6ebca1e --- /dev/null +++ b/pom.xml @@ -0,0 +1,23 @@ + + + 4.0.0 + + org.openstreetmap.josm.plugins + plugin-root + SNAPSHOT + + configuration + ${plugin.link} + + + Aarthy KC + + + + src + 19044 + Aarthy KC + org.openstreetmap.josm.plugins.ConfigPlugin + Task configurations + +