Fix #23112: Expand visibility of some objects and methods in JCSCache… #1606
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| name: Java CI Build | |
| env: | |
| junit_platform_version: '1.9.3' | |
| JAVAFX_VERSION: '17.0.7' | |
| on: | |
| push: | |
| branches: [master] | |
| defaults: | |
| run: | |
| shell: bash | |
| jobs: | |
| createrelease: | |
| name: Create Release | |
| runs-on: ubuntu-latest | |
| env: | |
| LANG: en_US.UTF-8 | |
| outputs: | |
| upload_url: ${{ steps.create_release.outputs.upload_url }} | |
| josm_revision: ${{ steps.create_revision.outputs.josm_revision }} | |
| josm_prerelease: ${{ steps.create_revision.outputs.josm_prerelease }} | |
| josm_release_tag: ${{ steps.create_revision.outputs.josm_release_tag }} | |
| steps: | |
| - name: Checkout | |
| uses: actions/checkout@v3 | |
| with: | |
| fetch-depth: 256 | |
| - name: Set revision env variable | |
| id: create_revision | |
| # grab josm revision from last git-svn-id | |
| run: | | |
| josm_revision="$(git log -1 --grep 'git-svn-id: https://josm.openstreetmap.de/svn/trunk@' --pretty=format:%B | tail -1 | sed -n 's%git-svn-id: https://josm.openstreetmap.de/svn/trunk@\([0-9]*\) [-0-9a-f]*%\1%p')" | |
| if [[ "$josm_revision" == "$(curl --silent https://josm.openstreetmap.de/tested)" ]]; then | |
| echo "josm_prerelease=false" >> $GITHUB_ENV | |
| echo "josm_prerelease=false" >> $GITHUB_OUTPUT | |
| josm_release_tag=$josm_revision-tested | |
| else | |
| echo "josm_prerelease=true" >> $GITHUB_ENV | |
| echo "josm_prerelease=true" >> $GITHUB_OUTPUT | |
| josm_release_tag=$josm_revision | |
| fi | |
| echo "josm_revision=$josm_revision" >> $GITHUB_ENV | |
| echo "josm_revision=$josm_revision" >> $GITHUB_OUTPUT | |
| echo "josm_release_tag=$josm_release_tag" >> $GITHUB_ENV | |
| echo "josm_release_tag=$josm_release_tag" >> $GITHUB_OUTPUT | |
| - name: Create release | |
| id: create_release | |
| uses: actions/create-release@v1 | |
| env: | |
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token | |
| with: | |
| tag_name: ${{ env.josm_release_tag }} | |
| release_name: JOSM release ${{ env.josm_release_tag }} | |
| body: | | |
| JOSM release ${{ env.josm_release_tag }} | |
| draft: false | |
| prerelease: ${{ env.josm_prerelease }} | |
| build: | |
| needs: createrelease | |
| runs-on: ${{ matrix.os }} | |
| env: | |
| LANG: en_US.UTF-8 | |
| strategy: | |
| fail-fast: false | |
| matrix: | |
| # test against latest update of each major Java version, as well as specific updates of LTS versions: | |
| java: [8, 11, 17, 20, 21-ea] | |
| os: [ubuntu-latest, macos-latest, windows-latest] | |
| name: Java ${{ matrix.java }} on ${{ matrix.os }} | |
| steps: | |
| - name: Checkout | |
| uses: actions/checkout@v3 | |
| with: | |
| fetch-depth: 256 | |
| - name: Cache | |
| uses: actions/cache@v3 | |
| with: | |
| path: | | |
| ~/.ivy2/cache/ | |
| ~/work/josm/josm/tools/ | |
| key: ${{ runner.os }}-ivy2-${{ hashFiles('build.xml', 'ivy.xml', 'tools/ivy.xml') }} | |
| - name: Setup Java ${{ matrix.java }} | |
| uses: actions/setup-java@v3 | |
| with: | |
| distribution: 'zulu' | |
| java-version: ${{ matrix.java }} | |
| - name: Install Ant | |
| uses: JOSM/JOSMPluginAction/actions/setup-ant@v1 | |
| - name: Optimise images | |
| if: ${{ runner.os == 'macos' && always() }} | |
| run: | | |
| brew install --cask imageoptim | |
| defaults write net.pornel.ImageOptim SvgoEnabled 1 | |
| defaults write net.pornel.ImageOptim PngCrush2Enabled 1 | |
| defaults write net.pornel.ImageOptim PngOutEnabled 1 | |
| /Applications/ImageOptim.app/Contents/MacOS/ImageOptim resources/images | |
| - name: Build with Ant | |
| env: | |
| SIGN_ALIAS: ${{ secrets.SIGN_ALIAS }} | |
| SIGN_CERT: ${{ secrets.SIGN_CERT }} | |
| SIGN_KEYPASS: ${{ secrets.SIGN_KEYPASS }} | |
| SIGN_STOREPASS: ${{ secrets.SIGN_STOREPASS }} | |
| SIGN_TSA: ${{ secrets.SIGN_TSA }} | |
| # Calls ant with -Dreleasebuild=true if we're a 'tested' build | |
| run: | | |
| export SIGN_KEYSTORE=certificate.p12 | |
| echo "$SIGN_CERT" | base64 --decode > $SIGN_KEYSTORE | |
| if [ "${{ needs.createrelease.outputs.josm_prerelease }}" == "true" ]; then | |
| ANT="ant" | |
| else | |
| ANT="ant -Dreleasebuild=true" | |
| fi | |
| $ANT dist | |
| rm $SIGN_KEYSTORE | |
| - name: Upload jar | |
| if: ${{ always() }} | |
| env: | |
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | |
| uses: actions/upload-release-asset@v1 | |
| with: | |
| upload_url: ${{ needs.createrelease.outputs.upload_url }} # This pulls from the CREATE RELEASE job above, referencing its ID to get its outputs object, which include a `upload_url`. | |
| asset_path: dist/josm-custom.jar | |
| asset_name: JOSM-${{ runner.os}}-java${{ matrix.java }}-${{ needs.createrelease.outputs.josm_revision }}.jar | |
| asset_content_type: application/java-archive | |
| - name: Build and package for macOS | |
| if: ${{ runner.os == 'macos' && matrix.java != '8' && matrix.java != '11' && always() }} | |
| env: | |
| CERT_MACOS_P12: ${{ secrets.CERT_MACOS_P12 }} | |
| CERT_MACOS_PW: ${{ secrets.CERT_MACOS_PW }} | |
| APPLE_ID_PW: ${{ secrets.APPLE_ID_PW }} | |
| run: | | |
| if [ ! -f tools/openjfx-${JAVAFX_VERSION}_${{ runner.os }}-jmods.zip ]; then | |
| curl -o tools/openjfx-${JAVAFX_VERSION}_${{ runner.os }}-jmods.zip https://download2.gluonhq.com/openjfx/${JAVAFX_VERSION}/openjfx-${JAVAFX_VERSION}_osx-x64_bin-jmods.zip | |
| fi | |
| unzip tools/openjfx-${JAVAFX_VERSION}_${{ runner.os }}-jmods.zip | |
| mv javafx-jmods-${JAVAFX_VERSION}/*.jmod $JAVA_HOME/jmods/ | |
| ./native/macosx/macos-jpackage.sh ${{ needs.createrelease.outputs.josm_revision }} | |
| - name: Setup Windows PATH | |
| if: ${{ runner.os == 'windows' && matrix.java != '8' && matrix.java != '11' && always() }} | |
| run: | | |
| echo "C:\Program Files (x86)\WiX Toolset v3.11\bin" >> $GITHUB_PATH | |
| echo "C:\Program Files (x86)\Windows Kits\10\bin\x64" >> $GITHUB_PATH | |
| echo "C:\Program Files (x86)\Windows Kits\10\App Certification Kit" >> $GITHUB_PATH | |
| - name: Build and package for Windows | |
| if: ${{ runner.os == 'windows' && matrix.java != '8' && matrix.java != '11' && always() }} | |
| env: | |
| SIGN_CERT: ${{ secrets.SIGN_CERT }} | |
| SIGN_STOREPASS: ${{ secrets.SIGN_STOREPASS }} | |
| SIGN_TSA: ${{ secrets.SIGN_TSA }} | |
| run: | | |
| if [ ! -f tools/openjfx-${JAVAFX_VERSION}_${{ runner.os }}-jmods.zip ]; then | |
| curl -o tools/openjfx-${JAVAFX_VERSION}_${{ runner.os }}-jmods.zip https://download2.gluonhq.com/openjfx/${JAVAFX_VERSION}/openjfx-${JAVAFX_VERSION}_windows-x64_bin-jmods.zip | |
| fi | |
| unzip tools/openjfx-${JAVAFX_VERSION}_${{ runner.os }}-jmods.zip | |
| mv javafx-jmods-${JAVAFX_VERSION}/*.jmod $JAVA_HOME/jmods/ | |
| ./native/windows/win-jpackage.sh ${{ needs.createrelease.outputs.josm_revision }} | |
| - name: Upload macOS app | |
| if: ${{ runner.os == 'macos' && matrix.java != '8' && matrix.java != '11' && always() }} | |
| uses: actions/upload-release-asset@v1 | |
| env: | |
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | |
| with: | |
| upload_url: ${{ needs.createrelease.outputs.upload_url }} # This pulls from the CREATE RELEASE job above, referencing its ID to get its outputs object, which include a `upload_url`. | |
| asset_path: app/JOSM.zip | |
| asset_name: JOSM-${{ runner.os}}-java${{ matrix.java }}-${{ needs.createrelease.outputs.josm_revision }}.zip | |
| asset_content_type: application/zip | |
| - name: Upload Windows Installer executable | |
| if: ${{ runner.os == 'windows' && matrix.java != '8' && matrix.java != '11' && always() }} | |
| uses: actions/upload-release-asset@v1 | |
| env: | |
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | |
| with: | |
| upload_url: ${{ needs.createrelease.outputs.upload_url }} # This pulls from the CREATE RELEASE job above, referencing its ID to get its outputs object, which include a `upload_url`. | |
| asset_path: app/JOSM.exe | |
| asset_name: JOSM-${{ runner.os}}-java${{ matrix.java }}-${{ needs.createrelease.outputs.josm_revision }}.exe | |
| asset_content_type: application/vnd.microsoft.portable-executable | |
| - name: Upload Windows Installer package | |
| if: ${{ runner.os == 'windows' && matrix.java != '8' && matrix.java != '11' && always() }} | |
| uses: actions/upload-release-asset@v1 | |
| env: | |
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | |
| with: | |
| upload_url: ${{ needs.createrelease.outputs.upload_url }} # This pulls from the CREATE RELEASE job above, referencing its ID to get its outputs object, which include a `upload_url`. | |
| asset_path: app/JOSM.msi | |
| asset_name: JOSM-${{ runner.os}}-java${{ matrix.java }}-${{ needs.createrelease.outputs.josm_revision }}.msi | |
| asset_content_type: application/x-ole-storage |