Fix typo

.github/workflows/build-all.yml

@@ -16,41 +16,31 @@ jobs:
   create-release:
     runs-on: ubuntu-latest
     outputs:
-      upload_url: ${{ steps.create_release.outputs.upload_url }}
+      release_tag_name: ${{ env.release_tag_name }}
       build_meta: ${{ env.build_meta }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Generate release info
         run: |
           cd release_gen
           chmod +x create_release_info.sh
           ./create_release_info.sh ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}} ${{github.run_number}} ${{github.repository}}
       - name: Create Release
-        id: create_release
-        uses: softprops/action-gh-release@v1
-        with:
-          name: ${{env.release_name}}
-          tag_name: ${{env.release_tag_name}}
-          body_path: release_gen/release_message.md
+        run: |
+          gh release create ${{env.release_tag_name}} --title "${{env.release_name}}" --notes-file release_gen/release_message.md
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Add LICENSE
-        uses: actions/upload-release-asset@v1
+        run: |
+          gh release upload ${{env.release_tag_name}} release_gen/LICENSE
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: release_gen/LICENSE
-          asset_name: LICENSE
-          asset_content_type: text/plain
-      - name: Add build_meta.json       
-        uses: actions/upload-release-asset@v1
+      - name: Add build_meta.json
+        run: |
+          gh release upload ${{env.release_tag_name}} release_gen/build_meta.json
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: release_gen/build_meta.json                                                           
-          asset_name: build_meta.json                                     
-          asset_content_type: application/json
       - name: Announce build_meta.json download url to other jobs
         run: |
           cd release_gen
@@ -61,187 +51,146 @@ jobs:
     runs-on: ubuntu-latest
     needs: create-release
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Set up QEMU
         uses: docker/setup-qemu-action@master
         with:
           platforms: all
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       -
         name: Build
         run: |
           chmod +x compile_linux.sh
           ./compile_linux.sh amd64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
       - name: Export distribution
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: out/binary_distrib.tar.gz
-          asset_name: linux-amd64.tar.gz
-          asset_content_type: application/octet-stream
-
-
-  build-linux-i386:
-    runs-on: ubuntu-latest
-    needs: create-release
-    steps:
-      - uses: actions/checkout@v1
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@master
-        with:
-          platforms: all
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Build
         run: |
-          chmod +x compile_linux.sh
-          ./compile_linux.sh 386 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
-      - name: Export distribution
-        uses: actions/upload-release-asset@v1
+          mv out/binary_distrib.tar.gz out/linux-amd64.tar.gz
+          gh release upload ${{needs.create-release.outputs.release_tag_name}} out/linux-amd64.tar.gz
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: out/binary_distrib.tar.gz
-          asset_name: linux-i386.tar.gz
-          asset_content_type: application/octet-stream
 
 
   build-linux-arm64:
     runs-on: ubuntu-latest
     needs: create-release
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Set up QEMU
         uses: docker/setup-qemu-action@master
         with:
           platforms: all
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       -
         name: Build
         run: |
           chmod +x compile_linux.sh
           ./compile_linux.sh arm64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
       - name: Export distribution
-        uses: actions/upload-release-asset@v1
+        run: |
+          mv out/binary_distrib.tar.gz out/linux-arm64.tar.gz
+          gh release upload ${{needs.create-release.outputs.release_tag_name}} out/linux-arm64.tar.gz
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: out/binary_distrib.tar.gz
-          asset_name: linux-arm64.tar.gz
-          asset_content_type: application/octet-stream
           
           
   build-linux-arm:
     runs-on: ubuntu-latest
     needs: create-release
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Set up QEMU
         uses: docker/setup-qemu-action@master
         with:
           platforms: all
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       -
         name: Build
         run: |
           chmod +x compile_linux.sh
           ./compile_linux.sh arm/v6 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
       - name: Export distribution
-        uses: actions/upload-release-asset@v1
+        run: |
+          mv out/binary_distrib.tar.gz out/linux-arm.tar.gz
+          gh release upload ${{needs.create-release.outputs.release_tag_name}} out/linux-arm.tar.gz
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: out/binary_distrib.tar.gz
-          asset_name: linux-arm.tar.gz
-          asset_content_type: application/octet-stream
 
 
   build-windows-amd64:
     runs-on: windows-2019
     needs: create-release
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       -
         name: Build
         shell: cmd
         run: |
           compile_windows.bat amd64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
       - name: Export distribution
-        uses: actions/upload-release-asset@v1
+        run: |
+          move out/binary_distrib.tar.gz out/windows-amd64.tar.gz
+          gh release upload ${{needs.create-release.outputs.release_tag_name}} out/windows-amd64.tar.gz
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: out/binary_distrib.tar.gz
-          asset_name: windows-amd64.tar.gz
-          asset_content_type: application/octet-stream
 
 
   build-windows-i386:
     runs-on: windows-2019
     needs: create-release
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       -
         name: Build
         shell: cmd
         run: |
           compile_windows.bat 386 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
       - name: Export distribution
-        uses: actions/upload-release-asset@v1
+        run: |
+          move out/binary_distrib.tar.gz out/windows-i386.tar.gz
+          gh release upload ${{needs.create-release.outputs.release_tag_name}} out/windows-i386.tar.gz
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: out/binary_distrib.tar.gz
-          asset_name: windows-i386.tar.gz
-          asset_content_type: application/octet-stream
           
   
   build-windows-arm64:
     runs-on: windows-2019
     needs: create-release
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       -
         name: Build
         shell: cmd
         run: |
           compile_windows.bat arm64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
       - name: Export distribution
-        uses: actions/upload-release-asset@v1
+        run: |
+          move out/binary_distrib.tar.gz out/windows-arm64.tar.gz
+          gh release upload ${{needs.create-release.outputs.release_tag_name}} out/windows-arm64.tar.gz
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: out/binary_distrib.tar.gz
-          asset_name: windows-arm64.tar.gz
-          asset_content_type: application/octet-stream
 
 
   build-macosx-amd64:
-    runs-on: macos-10.15
+    runs-on: macos-12
     needs: create-release
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       -
         name: Setup environment
         run: |
           chmod +x scripts/install_macos_dependencies.sh
           ./scripts/install_macos_dependencies.sh
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: 'adopt'
       - name: Install Apple certificate
         env:
           BUILD_CERTIFICATE_BASE64: ${{ secrets.APPLE_BUILD_CERTIFICATE_BASE64 }}
@@ -273,42 +222,40 @@ jobs:
         name: Build
         run: |
           chmod +x compile_macosx.sh
-          ./compile_macosx.sh amd64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }} "${{ secrets.APPLE_BUILD_CERTIFICATE_NAME }}" ${{ secrets.APPLE_TEAM_NAME }} ${{ secrets.APPLE_API_KEY_NAME }} ${{ secrets.APPLE_API_KEY_ISSUER }}
+          ./compile_macosx.sh amd64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }} "${{ secrets.APPLE_BUILD_CERTIFICATE_NAME }}" ${{ secrets.APPLE_TEAM_NAME }} ${{ secrets.APPLE_API_KEY_ID }} "${HOME}/private_keys/AuthKey_${{ secrets.APPLE_API_KEY_NAME }}.p8" ${{ secrets.APPLE_API_KEY_ISSUER }}
       - name: Clean up keychain
         if: ${{ always() }}
         run: |
           security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
           rm -rf "${HOME}/private_keys"
       - name: Export distribution
-        uses: actions/upload-release-asset@v1
+        run: |
+          mv out/binary_distrib.tar.gz out/macosx-amd64.tar.gz
+          gh release upload ${{needs.create-release.outputs.release_tag_name}} out/macosx-amd64.tar.gz
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: out/binary_distrib.tar.gz
-          asset_name: macosx-amd64.tar.gz
-          asset_content_type: application/octet-stream
       - name: Export javadoc
-        uses: actions/upload-release-asset@v1
+        run: |
+          gh release upload ${{needs.create-release.outputs.release_tag_name}} out/javadoc.tar.gz
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: out/javadoc.tar.gz
-          asset_name: javadoc.tar.gz
-          asset_content_type: application/octet-stream
 
 
   build-macosx-arm64:
-    runs-on: macos-10.15
+    runs-on: macos-12
     needs: create-release
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       -
         name: Setup environment
         run: |
           chmod +x scripts/install_macos_dependencies.sh
           ./scripts/install_macos_dependencies.sh
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: 'adopt'
       - name: Install Apple certificate
         env:
           BUILD_CERTIFICATE_BASE64: ${{ secrets.APPLE_BUILD_CERTIFICATE_BASE64 }}
@@ -340,20 +287,17 @@ jobs:
         name: Build
         run: |
           chmod +x compile_macosx.sh
-          ./compile_macosx.sh arm64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }} "${{ secrets.APPLE_BUILD_CERTIFICATE_NAME }}" ${{ secrets.APPLE_TEAM_NAME }} ${{ secrets.APPLE_API_KEY_NAME }} ${{ secrets.APPLE_API_KEY_ISSUER }}
+          ./compile_macosx.sh arm64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }} "${{ secrets.APPLE_BUILD_CERTIFICATE_NAME }}" ${{ secrets.APPLE_TEAM_NAME }} ${{ secrets.APPLE_API_KEY_ID }} "${HOME}/private_keys/AuthKey_${{ secrets.APPLE_API_KEY_NAME }}.p8" ${{ secrets.APPLE_API_KEY_ISSUER }}
       - name: Clean up keychain
         if: ${{ always() }}
         run: |
           security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
           rm -rf "${HOME}/private_keys"
       - name: Export distribution
-        uses: actions/upload-release-asset@v1
+        run: |
+          mv out/binary_distrib.tar.gz out/macosx-arm64.tar.gz
+          gh release upload ${{needs.create-release.outputs.release_tag_name}} out/macosx-arm64.tar.gz
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: out/binary_distrib.tar.gz
-          asset_name: macosx-arm64.tar.gz
-          asset_content_type: application/octet-stream
 
 

.github/workflows/build-linux-amd64.yml

@@ -16,14 +16,14 @@ jobs:
   build-linux-amd64:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Set up QEMU
         uses: docker/setup-qemu-action@master
         with:
           platforms: all
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       -
         name: Build
         run: |
@@ -31,7 +31,7 @@ jobs:
           ./compile_linux.sh amd64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
       -
         name: Export artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: linux-amd64.tar.gz
           path: out/binary_distrib.tar.gz

.github/workflows/build-linux-arm.yml

@@ -16,14 +16,14 @@ jobs:
   build-linux-arm:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Set up QEMU
         uses: docker/setup-qemu-action@master
         with:
           platforms: all
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       -
         name: Build
         run: |
@@ -31,7 +31,7 @@ jobs:
           ./compile_linux.sh arm/v6 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
       -
         name: Export artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: linux-arm.tar.gz
           path: out/binary_distrib.tar.gz

.github/workflows/build-linux-arm64.yml

@@ -16,14 +16,14 @@ jobs:
   build-linux-arm64:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Set up QEMU
         uses: docker/setup-qemu-action@master
         with:
           platforms: all
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       -
         name: Build
         run: |
@@ -31,7 +31,7 @@ jobs:
           ./compile_linux.sh arm64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
       -
         name: Export artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: linux-arm64.tar.gz
           path: out/binary_distrib.tar.gz

.github/workflows/build-linux-i386.yml

@@ -1,37 +0,0 @@
-name: build-linux-i386
-
-on:
-  workflow_dispatch:
-    inputs:
-      repo:
-        description: 'Git repository to clone'
-        required: true
-        default: 'https://bitbucket.org/chromiumembedded/java-cef.git'
-      ref:
-        description: 'Git commit id to checkout'
-        required: true
-        default: 'master'
-
-jobs:
-  build-linux-i386:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@master
-        with:
-          platforms: all
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Build
-        run: |
-          chmod +x compile_linux.sh
-          ./compile_linux.sh 386 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
-      -
-        name: Export artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: linux-i386.tar.gz
-          path: out/binary_distrib.tar.gz

.github/workflows/build-macosx-amd64.yml

@@ -14,14 +14,19 @@ on:
 
 jobs:
   build-macosx-amd64:
-    runs-on: macos-10.15
+    runs-on: macos-12
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       -
         name: Setup environment
         run: |
           chmod +x scripts/install_macos_dependencies.sh
           ./scripts/install_macos_dependencies.sh
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: 'adopt'
       - name: Install Apple certificate
         env:
           BUILD_CERTIFICATE_BASE64: ${{ secrets.APPLE_BUILD_CERTIFICATE_BASE64 }}
@@ -53,7 +58,7 @@ jobs:
         name: Build
         run: |
           chmod +x compile_macosx.sh
-          ./compile_macosx.sh amd64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }} "${{ secrets.APPLE_BUILD_CERTIFICATE_NAME }}" ${{ secrets.APPLE_TEAM_NAME }} ${{ secrets.APPLE_API_KEY_NAME }} ${{ secrets.APPLE_API_KEY_ISSUER }}
+          ./compile_macosx.sh amd64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }} "${{ secrets.APPLE_BUILD_CERTIFICATE_NAME }}" ${{ secrets.APPLE_TEAM_NAME }} ${{ secrets.APPLE_API_KEY_ID }} "${HOME}/private_keys/AuthKey_${{ secrets.APPLE_API_KEY_NAME }}.p8" ${{ secrets.APPLE_API_KEY_ISSUER }}
       - name: Clean up keychain
         if: ${{ always() }}
         run: |
@@ -61,7 +66,7 @@ jobs:
           rm -rf "${HOME}/private_keys"
       -
         name: Export artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: macosx-amd64.tar.gz
           path: out/binary_distrib.tar.gz

.github/workflows/build-macosx-arm64.yml

@@ -14,14 +14,19 @@ on:
 
 jobs:
   build-macosx-arm64:
-    runs-on: macos-10.15
+    runs-on: macos-12
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       -
         name: Setup environment
         run: |
           chmod +x scripts/install_macos_dependencies.sh
           ./scripts/install_macos_dependencies.sh
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: 'adopt'
       - name: Install Apple certificate
         env:
           BUILD_CERTIFICATE_BASE64: ${{ secrets.APPLE_BUILD_CERTIFICATE_BASE64 }}
@@ -53,7 +58,7 @@ jobs:
         name: Build
         run: |
           chmod +x compile_macosx.sh
-          ./compile_macosx.sh arm64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }} "${{ secrets.APPLE_BUILD_CERTIFICATE_NAME }}" ${{ secrets.APPLE_TEAM_NAME }} ${{ secrets.APPLE_API_KEY_NAME }} ${{ secrets.APPLE_API_KEY_ISSUER }}
+          ./compile_macosx.sh arm64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }} "${{ secrets.APPLE_BUILD_CERTIFICATE_NAME }}" ${{ secrets.APPLE_TEAM_NAME }} ${{ secrets.APPLE_API_KEY_ID }} "${HOME}/private_keys/AuthKey_${{ secrets.APPLE_API_KEY_NAME }}.p8" ${{ secrets.APPLE_API_KEY_ISSUER }}
       - name: Clean up keychain
         if: ${{ always() }}
         run: |
@@ -61,7 +66,7 @@ jobs:
           rm -rf "${HOME}/private_keys"
       -
         name: Export artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: macosx-arm64.tar.gz
           path: out/binary_distrib.tar.gz

.github/workflows/build-windows-amd64.yml

@@ -16,7 +16,7 @@ jobs:
   build-windows-amd64:
     runs-on: windows-2019
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       -
         name: Build
         shell: cmd
@@ -24,7 +24,7 @@ jobs:
           compile_windows.bat amd64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
       -
         name: Export artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: windows-amd64.tar.gz
           path: out/binary_distrib.tar.gz

.github/workflows/build-windows-arm64.yml

@@ -16,7 +16,7 @@ jobs:
   build-windows-arm64:
     runs-on: windows-2019
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       -
         name: Build
         shell: cmd
@@ -24,7 +24,7 @@ jobs:
           compile_windows.bat arm64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
       -
         name: Export artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: windows-arm64.tar.gz
           path: out/binary_distrib.tar.gz

.github/workflows/build-windows-i386.yml

@@ -16,7 +16,7 @@ jobs:
   build-windows-i386:
     runs-on: windows-2019
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       -
         name: Build
         shell: cmd
@@ -24,7 +24,7 @@ jobs:
           compile_windows.bat 386 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
       -
         name: Export artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: windows-i386.tar.gz
           path: out/binary_distrib.tar.gz

README.md

@@ -12,7 +12,7 @@
 <table>
   <tr>
     <td width="12%"></td>
-    <td width="22%"><a href="#"><img src="https://simpleicons.org/icons/linux.svg" alt="linux" width="32" height="32"></a><br/><b>amd64, arm64, i386 & arm</b></td>
+    <td width="22%"><a href="#"><img src="https://simpleicons.org/icons/linux.svg" alt="linux" width="32" height="32"></a><br/><b>amd64, arm64 & arm</b></td>
     <td width="22%"><a href="#"><img src="https://simpleicons.org/icons/windows.svg" alt="windows" width="32" height="32"></a><br/><b>amd64 & i386</b></td>
     <td width="22%"><a href="#"><img src="https://simpleicons.org/icons/windows.svg" alt="windows" width="32" height="32"></a><br/><b>arm64</b></td>
     <td width="22%"><a href="#"><img src="https://simpleicons.org/icons/apple.svg" alt="apple" width="32" height="32"></a><br/><b>amd64 & arm64</b></td>
@@ -29,14 +29,14 @@
     <td>GCC 10</td>
     <td>VS 2019</td>
     <td>VS 2019</td>
-    <td>Xcode 12</td>
+    <td>Xcode 13</td>
   </tr>
   <tr>
     <td><b>Build</b></td>
     <td>Python 3.7; <code>ninja</code></td>
     <td>Python 3.7; <code>ninja</code></td>
     <td>Python 3.7; <code>ninja</code></td>
-    <td>Python 2.7; <code>ninja</code>; SDK10.11</td>
+    <td>Python 2.7; <code>ninja</code>; SDK10.13</td>
   </tr>
   <tr>
     <td><b>Limitations</b></td>
@@ -61,11 +61,26 @@ You have multiple options to build your own project using this repository. They
 To build another git repo, simply fork this repository. Then go to the "Actions" tab of your forked repository,
 activate the workflows and manually run the `build-all` (or `build-<platform>`) workflow with your repository and commit id/branch specified.
 This will trigger a build of your desired repository and platforms.
+To produce a build for MacOS, you will need to specify your code signing information or remove the signing and notarization steps from the action workflows.
+
+Required Actions Secrets for signing and notarization:
+
++`APPLE_API_KEY_BASE64`: Your API key to access the Apple Notarization Service (in base64)
++`APPLE_API_KEY_ISSUER`: UUID of issuer (can be found along with your generated key in Apple Dev Console)
++`APPLE_API_KEY_NAME`: The name to be used for your API key on the runner (can be random)
++`APPLE_API_KEY_ID`: The ID of your key (10 digit code)
++`APPLE_BUILD_CERTIFICATE_BASE64`: Base64 encoded pkcs12 certificate file from Apple to use for signing
++`APPLE_BUILD_CERTIFICATE_NAME`: Your certificate name (usually starts with `Developer ID Application`)
++`APPLE_P12_PASSWORD`: Password of your pkcs12 certificate file
++`APPLE_KEYCHAIN_PASSWORD`: A random password to use for the keychain on the runner
++`APPLE_TEAM_NAME`: Your apple team name, part of the certificate name (10 digit id in brackets)`
+
+You can obtain the api key [here](https://appstoreconnect.apple.com/access/api) (make sure key has developer access) and the certificate [here](https://developer.apple.com/account/resources/certificates/list) (choose Developer ID Application).
+
 
 ### Building locally
 To build locally, put your sources in the `jcef` directory of this repository, or leave it empty to clone a repository.
-On Windows and Linux, make sure you installed docker (NOT the Snap version!).
-On MacOS, make sure you installed the build dependencies specified
+On Windows and Linux, make sure you installed docker (NOT the Snap version!). On MacOS, make sure you installed the build dependencies specified
 [here](https://bitbucket.org/chromiumembedded/java-cef/wiki/BranchesAndBuilding) and `ninja`.
 
 Then execute `compile-<os>.<sh|bat> <arch> <buildType> [<gitrepo> <gitref>]`.

compile_linux.sh

@@ -4,7 +4,7 @@ if [ $# -lt 2 ] || [ $# -eq 3 ]
   then
     echo "Usage: ./compile_linux.sh <architecture> <buildType> [<gitrepo> <gitref>]"
     echo ""
-    echo "architecture: the target architecture to build for. Architectures are either arm64, arm/v6, 386 or amd64."
+    echo "architecture: the target architecture to build for. Architectures are either arm64, arm/v6 or amd64."
     echo "buildType: either Release or Debug"
     echo "gitrepo: git repository url to clone"
     echo "gitref: the git commit id to pull"

compile_macosx.sh

@@ -2,7 +2,7 @@
 
 if [ $# -lt 2 ] || [ $# -eq 3 ]
   then
-    echo "Usage: ./compile_macosx.sh <architecture> <buildType> [<gitrepo> <gitref>] [<certname> <teamname> <applekeyid> <applekeyissuer>]"
+    echo "Usage: ./compile_macosx.sh <architecture> <buildType> [<gitrepo> <gitref>] [<certname> <teamname> <applekeyid> <applekeypath> <applekeyissuer>]"
     echo ""
     echo "architecture: the target architecture to build for. Architectures are either amd64 or arm64."
     echo "buildType: either Release or Debug"
@@ -10,7 +10,8 @@ if [ $# -lt 2 ] || [ $# -eq 3 ]
     echo "gitref: the git commit id to pull"
     echo "certname: the apple signing certificate name. Something like \"Developer ID Application: xxx (yyy)\""
     echo "teamname: the apple team name. 10-digit id yyy from the cert name."
-    echo "applekeyid: your apple api key id"
+    echo "applekeyid: id of your apple api key"
+    echo "applekeypath: path to your apple api key"
     echo "applekeyissuer: uuid of your apple api key issuer"
     exit 1
 fi
@@ -72,7 +73,12 @@ cd binary_distrib/macosx64
 if [ $# -gt 4 ]
   then
     chmod +x $WORK_DIR/macosx_codesign.sh
-    bash $WORK_DIR/macosx_codesign.sh $(pwd) "$5" $6 $7 $8
+    bash $WORK_DIR/macosx_codesign.sh $(pwd) "$5" $6 $7 $8 $9
+    retVal=$?
+    if [ $retVal -ne 0 ]; then
+        echo "Binaries are not correctly signed"
+        exit 1
+    fi
 fi
 
 #Pack binary_distrib

entitlements/entitlements-browser.plist

@@ -1,16 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-   <key>com.apple.security.device.audio-input</key>
-   <true/>
-   <key>com.apple.security.device.bluetooth</key>
-   <true/>
-   <key>com.apple.security.device.camera</key>
-   <true/>
-   <key>com.apple.security.device.print</key>
-   <true/>
-   <key>com.apple.security.device.usb</key>
-   <true/>
-</dict>
+    <dict>
+         <key>com.apple.security.inherit</key>
+                <true/>
+                <key>com.apple.security.network.client</key>
+                <true/>
+                <key>com.apple.security.files.user-selected.read-write</key>
+                <true/>
+                <key>com.apple.security.files.bookmarks.app-scope</key>
+                <true/>
+                <key>com.apple.security.cs.allow-jit</key>
+                <true/>
+                <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+                <true/>
+                <key>com.apple.security.cs.disable-library-validation</key>
+                <true/>
+                <key>com.apple.security.cs.disable-executable-page-protection</key>
+                <true/>
+                <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+                <true/>
+                <key>com.apple.security.device.audio-input</key>
+                <true/>
+                <key>com.apple.security.device.camera</key>
+                <true/>
+                <key>com.apple.security.personal-information.location</key>
+                <true/>
+                <key>com.apple.security.personal-information.addressbook</key>
+                <true/>
+                <key>com.apple.security.personal-information.calendars</key>
+                <true/>
+                <key>com.apple.security.personal-information.photos-library</key>
+                <true/>
+                <key>com.apple.security.automation.apple-events</key>
+                <true/>
+    </dict>
 </plist>

entitlements/entitlements-helper.plist

@@ -1,12 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-   <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-   <true/>
-   <key>com.apple.security.cs.disable-library-validation</key>
-   <true/>
-   <key>com.apple.security.cs.allow-jit</key>
-   <true/>
-</dict>
+    <dict>
+         <key>com.apple.security.inherit</key>
+                <true/>
+                <key>com.apple.security.network.client</key>
+                <true/>
+                <key>com.apple.security.files.user-selected.read-write</key>
+                <true/>
+                <key>com.apple.security.files.bookmarks.app-scope</key>
+                <true/>
+                <key>com.apple.security.cs.allow-jit</key>
+                <true/>
+                <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+                <true/>
+                <key>com.apple.security.cs.disable-library-validation</key>
+                <true/>
+                <key>com.apple.security.cs.disable-executable-page-protection</key>
+                <true/>
+                <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+                <true/>
+                <key>com.apple.security.device.audio-input</key>
+                <true/>
+                <key>com.apple.security.device.camera</key>
+                <true/>
+                <key>com.apple.security.personal-information.location</key>
+                <true/>
+                <key>com.apple.security.personal-information.addressbook</key>
+                <true/>
+                <key>com.apple.security.personal-information.calendars</key>
+                <true/>
+                <key>com.apple.security.personal-information.photos-library</key>
+                <true/>
+                <key>com.apple.security.automation.apple-events</key>
+                <true/>
+    </dict>
 </plist>

macosx_codesign.sh

@@ -1,13 +1,14 @@
 #!/bin/bash
 
-if [ $# -lt 5 ]
+if [ $# -lt 6 ]
   then
-    echo "Usage: ./macosx_codesign.sh <path> <certname> <teamname> <applekeyid> <applekeyissuer>"
+    echo "Usage: ./macosx_codesign.sh <path> <certname> <teamname> <applekeyid> <applekeypath> <applekeyissuer>"
     echo ""
     echo "path: the absolute(!) target path"
     echo "certname: the apple signing certificate name. Something like \"Developer ID Application: xxx (yyy)\""
     echo "teamname: the apple team name. 10-digit id yyy from the cert name."
-    echo "applekeyid: your apple api key id"
+    echo "applekeyid: id of your apple api key"
+    echo "applekeypath: path to your apple api key"
     echo "applekeyissuer: uuid of your apple api key issuer"
     exit 1
 fi
@@ -28,23 +29,21 @@ chmod +x macosx_codesign_zip.sh
 #Sign helpers
 echo "Signing helpers..."
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_HELPER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper.app"
-bash macosx_notarize.sh "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper.app" "$2" $3 org.jcef.jcef.helper $4 $5
+bash macosx_notarize.sh "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper.app" "$2" $3 org.jcef.jcef.helper $4 $5 $6
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_HELPER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper (GPU).app"
-bash macosx_notarize.sh "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper (GPU).app" "$2" $3 org.jcef.jcef.helper.gpu $4 $5
+bash macosx_notarize.sh "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper (GPU).app" "$2" $3 org.jcef.jcef.helper.gpu $4 $5 $6
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_HELPER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper (Plugin).app"
-bash macosx_notarize.sh "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper (Plugin).app" "$2" $3 org.jcef.jcef.helper.plugin $4 $5
+bash macosx_notarize.sh "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper (Plugin).app" "$2" $3 org.jcef.jcef.helper.plugin $4 $5 $6
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_HELPER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper (Renderer).app"
-bash macosx_notarize.sh "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper (Renderer).app" "$2" $3 org.jcef.jcef.helper.renderer $4 $5
+bash macosx_notarize.sh "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/jcef Helper (Renderer).app" "$2" $3 org.jcef.jcef.helper.renderer $4 $5 $6
 
 #Sign libraries and framework
 echo "Signing libraries and framework..."
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME/Libraries/libEGL.dylib"
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME/Libraries/libGLESv2.dylib"
-codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME/Libraries/libswiftshader_libEGL.dylib"
-codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME/Libraries/libswiftshader_libGLESv2.dylib"
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME/Libraries/libvk_swiftshader.dylib"
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME"
-bash macosx_notarize.sh "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME" "$2" $3 org.cef.framework $4 $5
+bash macosx_notarize.sh "$APP_DIR/$APP_NAME/$FRAMEWORKS_DIR/$FRAMEWORK_NAME" "$2" $3 org.cef.framework $4 $5 $6
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/Contents/Java/libjcef.dylib"
 bash macosx_codesign_zip.sh "$APP_DIR/$APP_NAME/Contents/Java/gluegen-rt-natives-macosx-universal.jar" "natives/macosx-universal/libgluegen_rt.dylib" "$2"
 bash macosx_codesign_zip.sh "$APP_DIR/$APP_NAME/Contents/Java/jogl-all-natives-macosx-universal.jar" "natives/macosx-universal/libnativewindow_awt.dylib" "$2"
@@ -53,6 +52,14 @@ bash macosx_codesign_zip.sh "$APP_DIR/$APP_NAME/Contents/Java/jogl-all-natives-m
 bash macosx_codesign_zip.sh "$APP_DIR/$APP_NAME/Contents/Java/jogl-all-natives-macosx-universal.jar" "natives/macosx-universal/libnewt_head.dylib" "$2"
 bash macosx_codesign_zip.sh "$APP_DIR/$APP_NAME/Contents/Java/jogl-all-natives-macosx-universal.jar" "natives/macosx-universal/libjogl_desktop.dylib" "$2"
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME"
-bash macosx_notarize.sh "$APP_DIR/$APP_NAME" "$2" $3 org.jcef.jcef $4 $5
+bash macosx_notarize.sh "$APP_DIR/$APP_NAME" "$2" $3 org.jcef.jcef $4 $5 $6
+
+echo "Checking notarization validity"
+spctl -vvv --assess --type exec "$APP_DIR/$APP_NAME"
+retVal=$?
+if [ $retVal -ne 0 ]; then
+    echo "Binaries are not correctly signed"
+    exit 1
+fi
 
 echo "Done signing binaries"

macosx_notarize.sh

@@ -3,15 +3,16 @@
 #Contents partly stolen from https://scriptingosx.com/2019/09/notarize-a-command-line-tool/
 #Will need updating for XCode 13+
 
-if [ $# -lt 6 ]
+if [ $# -lt 7 ]
   then
-    echo "Usage: ./macosx_notarize.sh <path> <certname> <teamname> <bundleid> <applekeyid> <applekeyissuer>"
+    echo "Usage: ./macosx_notarize.sh <path> <certname> <teamname> <bundleid> <applekeyid> <applekeypath> <applekeyissuer>"
     echo ""
     echo "path: the absolute(!) target path"
     echo "certname: the apple signing certificate name. Something like \"Developer ID Application: xxx (yyy)\""
     echo "teamname: the apple team name. 10-digit id yyy from the cert name."
     echo "bundleid: the bundle id of the artifact"
-    echo "applekeyid: your apple api key id"
+    echo "applekeyid: id of your apple api key"
+    echo "applekeypath: path to your apple api key"
     echo "applekeyissuer: uuid of your apple api key issuer"
     exit 1
 fi
@@ -27,50 +28,27 @@ cd $APP_DIR
 echo "Creating zip"
 zip -r "$APP_NAME.zip" "$APP_NAME"
 
-echo "Uploading $ZIP_PATH for notarization"
-requestUUID=$(xcrun altool --notarize-app \
-                           --type macos \
-                           --primary-bundle-id "$4" \
-                           --apiKey "$5" \
-                           --apiIssuer "$6" \
-                           --file "$1.zip" 2>&1 \
-                  | awk '/RequestUUID/ { print $NF; }')
-#                          --asc-provider "$3" \
+echo "Uploading $ZIP_PATH for notarization and waiting for result"
+xcrun notarytool submit "$1.zip" \
+                 --key $6 \
+                 --key-id $5 \
+                 --issuer $7 \
+                 --wait 2>&1 | tee notary_output.txt
+rm "$APP_NAME.zip"
+requestUUID=$(cat notary_output.txt | awk '/id:/ { print $NF; exit; }')
+rm notary_output.txt
 
-echo "Notarization RequestUUID: $requestUUID"
-
-# clean up zip
-rm -f "$APP_NAME.zip"
-
-if [[ $requestUUID == "" ]]; then 
-        echo "Could not upload for notarization"
-        exit 1
-fi
-
-# wait for status to be not "in progress" any more
-request_status="in progress"
-while [[ "$request_status" == "in progress" ]]; do
-    echo -n "waiting... "
-    sleep 60
-    request_status=$(xcrun altool --notarization-info "$requestUUID" \
-                              --apiKey "$5" \
-                              --apiIssuer "$6" 2>&1 \
-                 | awk -F ': ' '/Status:/ { print $2; }' )
-    echo "$request_status"
-done
-
-# print status information
-xcrun altool --notarization-info "$requestUUID" \
-             --apiKey "$5" \
-             --apiIssuer "$6"
-echo
-
-if [[ $request_status != "success" ]]; then
-    echo "Could not notarize!"
-    exit 1
-fi
+echo "Notarization log:"
+xcrun notarytool log $requestUUID \
+                 --key $6 \
+                 --key-id $5 \
+                 --issuer $7 \
+                 notarization.log
+cat notarization.log
+rm -f notarization.log
+echo ""
 
 # staple
-xcrun stapler staple "$1"
+xcrun stapler staple -v "$1"
 
 echo "##########################################################"

release_gen/create_release_info.sh

@@ -76,7 +76,6 @@ mv LICENSE.txt ../LICENSE
   echo "  \"actions_url\": \"$3\", "
   echo "  \"actions_number\": \"$4\", "
   echo "  \"filename_linux_amd64\": \"linux-amd64.tar.gz\", "
-  echo "  \"filename_linux_i386\": \"linux-i386.tar.gz\", "
   echo "  \"filename_linux_arm64\": \"linux-arm64.tar.gz\", "
   echo "  \"filename_linux_arm\": \"linux-arm.tar.gz\", "
   echo "  \"filename_windows_amd64\": \"windows-amd64.tar.gz\", "
@@ -88,7 +87,6 @@ mv LICENSE.txt ../LICENSE
   echo "  \"release_tag\": \"$real_release_tag\","
   echo "  \"release_url\": \"https://github.com/$5/releases/tag/$release_tag\", "
   echo "  \"download_url_linux_amd64\": \"https://github.com/$5/releases/download/$release_tag/linux-amd64.tar.gz\", "
-  echo "  \"download_url_linux_i386\": \"https://github.com/$5/releases/download/$release_tag/linux-i386.tar.gz\", "
   echo "  \"download_url_linux_arm64\": \"https://github.com/$5/releases/download/$release_tag/linux-arm64.tar.gz\", "
   echo "  \"download_url_linux_arm\": \"https://github.com/$5/releases/download/$release_tag/linux-arm.tar.gz\", "
   echo "  \"download_url_windows_amd64\": \"https://github.com/$5/releases/download/$release_tag/windows-amd64.tar.gz\", "

scripts/run_linux.sh

@@ -59,7 +59,8 @@ chmod +x compile.sh
 if [ ${TARGETARCH} == 'amd64' ] || [ ${TARGETARCH} == 'arm64' ]; then
     ./compile.sh linux64
 elif [ ${TARGETARCH} == '386' ]; then
-    ./compile.sh linux32
+    echo "386 is no longer supported since chromium 104"
+    exit 1
 else
     echo "Can not compile java classes under arm/v6 currently. So we copy from prebuild directory."
     mkdir -p /jcef/out/linux32