diff --git a/.github/workflows/ant-release.yml b/.github/workflows/ant-release.yml deleted file mode 100644 index 47dc3d4..0000000 --- a/.github/workflows/ant-release.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Release - -on: - release: - types: [created] - -jobs: - call-workflow: - uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@v1 - with: - josm-revision: "r14628" - diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index a570b4c..3db0d0b 100644 --- a/.github/workflows/ant.yml +++ b/.github/workflows/ant.yml @@ -10,15 +10,47 @@ on: branches: - master - $default-branch - schedule: - - cron: "22 18 * * 5" workflow_dispatch: +permissions: + id-token: write + attestations: write + contents: write + packages: write + checks: write + jobs: + check-release-needed: + runs-on: ubuntu-latest + outputs: + release_needed: ${{ steps.create_release_needed.outputs.release_needed }} + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: ${{ (github.repository == 'JOSM/kartverketimport' && github.ref_type == 'branch' && github.ref_name == 'master' && github.event_name != 'schedule' && github.event_name != 'pull_request') && '0' || '1' }} + + - name: Set release needed + id: create_release_needed + run: | + 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/"* ]] || [[ $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: ["", "r14628"] - uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@v1 + josm-revision: ["", "r19044"] + 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' }} + secrets: inherit + diff --git a/build.xml b/build.xml index 6721271..984f5c6 100644 --- a/build.xml +++ b/build.xml @@ -21,8 +21,9 @@ - - + + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..c6d87ec --- /dev/null +++ b/pom.xml @@ -0,0 +1,54 @@ + + 4.0.0 + + org.openstreetmap.josm.plugins + plugin-root + SNAPSHOT + + kartverketimport + + ${plugin.link} + + + Torstein Ingebrigtsen Bø + + + + UTF-8 + UTF-8 + src + 19044 + Torstein Ingebrigtsen Bø + org.openstreetmap.josm.plugins.kartverket.KartverketPlugin + Tools to help import Kartverket N50 + https://github.com/JOSM/kartverketimport + utilsplugin2 + true + + + + org.openstreetmap.josm.plugins + utilsplugin2 + SNAPSHOT + provided + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + ${plugin.link} + ${plugin.requires} + ${plugin.canloadatruntime} + + + + + + +