Skip to content

Commit

Permalink
Fix release issues
Browse files Browse the repository at this point in the history
Signed-off-by: Taylor Smock <[email protected]>
  • Loading branch information
tsmock committed Aug 13, 2024
1 parent 772dd5e commit a4e3036
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 21 deletions.
30 changes: 23 additions & 7 deletions .github/workflows/ant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,51 @@ on:
- $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@v2
uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@v3
with:
josm-revision: ""
java-version: 17
call-workflow-min:
uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@v2
uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@v3
with:
josm-revision: "r18877"
java-version: 17
perform-revision-tagging: ${{ github.repository == 'JOSM/Mapillary' && github.ref_type == 'branch' && github.ref_name == 'master' && github.event_name != 'schedule' && github.event_name != 'pull_request' }}

add-mapillary-keys:
runs-on: ubuntu
runs-on: ubuntu-latest
needs: call-workflow-min
if: needs.call-workflow-min.outputs.tag
env:
GH_TOKEN: ${{ github.token }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Echo env
run: echo ${{ needs.call-workflow-min.outputs.tag }}
- name: Get Mapillary jar
run: gh release download ${{ needs.call-workflow-min.outputs.tag }} --pattern Mapillary.jar
- name: Add keys
run: |
cat <<EOF > mapillary_api_keys.json
{
"MAPILLARY_CLIENT_ID": "${real_MAPILLARY_CLIENT_ID}",
"MAPILLARY_CLIENT_TOKEN": "${real_MAPILLARY_CLIENT_TOKEN}",
"MAPILLARY_CLIENT_SECRET": "${real_MAPILLARY_CLIENT_SECRET}"
"MAPILLARY_CLIENT_ID": "${{ secrets.MAPILLARY_CLIENT_ID }}",
"MAPILLARY_CLIENT_TOKEN": "${{ secrets.MAPILLARY_CLIENT_TOKEN }}",
"MAPILLARY_CLIENT_SECRET": "${{ secrets.MAPILLARY_CLIENT_SECRET }}"
}
EOF
zip Mapillary.jar mapillary_api_keys.json
- name: Perform attestation (jar after adding API keys)
uses: actions/attest-build-provenance@v1
with:
subject-path: Mapillary.jar
- name: Upload Mapillary jar
run: gh release upload ${{ needs.call-workflow-min.outputs.tag }} --clobber Mapillary.jar
14 changes: 0 additions & 14 deletions .github/workflows/reports.yaml

This file was deleted.

0 comments on commit a4e3036

Please sign in to comment.