diff --git a/.github/workflows/android-opengl.yml b/.github/workflows/android-opengl.yml index 0894809..88f83bf 100644 --- a/.github/workflows/android-opengl.yml +++ b/.github/workflows/android-opengl.yml @@ -14,7 +14,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + + - uses: actions/setup-java@v3 + with: + distribution: 'oracle' + java-version: '17' + - name: Get Submodules run: ./get_dlc diff --git a/.github/workflows/emscripten-webgl.yml b/.github/workflows/emscripten-webgl.yml index 0c8d84f..1972be3 100644 --- a/.github/workflows/emscripten-webgl.yml +++ b/.github/workflows/emscripten-webgl.yml @@ -14,7 +14,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - name: Get Submodules run: ./get_dlc diff --git a/.github/workflows/emscripten-webgpu.yml b/.github/workflows/emscripten-webgpu.yml index 1680146..a42b6e5 100644 --- a/.github/workflows/emscripten-webgpu.yml +++ b/.github/workflows/emscripten-webgpu.yml @@ -14,7 +14,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - name: Get Submodules run: ./get_dlc diff --git a/.github/workflows/freebsd-opengl.yml b/.github/workflows/freebsd-opengl.yml index 24c61a1..a447b2b 100644 --- a/.github/workflows/freebsd-opengl.yml +++ b/.github/workflows/freebsd-opengl.yml @@ -14,7 +14,7 @@ jobs: runs-on: macos-12 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Get Submodules run: ./get_dlc diff --git a/.github/workflows/ios-metal.yml b/.github/workflows/ios-metal.yml index a059134..5feca9c 100644 --- a/.github/workflows/ios-metal.yml +++ b/.github/workflows/ios-metal.yml @@ -14,7 +14,8 @@ jobs: runs-on: macOS-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - name: Get Submodules run: ./get_dlc diff --git a/.github/workflows/ios-opengl.yml b/.github/workflows/ios-opengl.yml index 07078f7..d11d14c 100644 --- a/.github/workflows/ios-opengl.yml +++ b/.github/workflows/ios-opengl.yml @@ -14,7 +14,8 @@ jobs: runs-on: macOS-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - name: Get Submodules run: ./get_dlc diff --git a/.github/workflows/linux-arm-opengl.yml b/.github/workflows/linux-arm-opengl.yml index 71ed95d..8a4ba67 100644 --- a/.github/workflows/linux-arm-opengl.yml +++ b/.github/workflows/linux-arm-opengl.yml @@ -23,7 +23,7 @@ jobs: distro: ubuntu20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: uraimo/run-on-arch-action@v2.0.9 name: Run Tests in ${{ matrix.distro }} ${{ matrix.arch }} id: build diff --git a/.github/workflows/linux-opengl.yml b/.github/workflows/linux-opengl.yml index 42adfed..52be4f3 100644 --- a/.github/workflows/linux-opengl.yml +++ b/.github/workflows/linux-opengl.yml @@ -14,7 +14,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - name: Apt Update run: sudo apt update - name: Apt Install diff --git a/.github/workflows/macos-metal.yml b/.github/workflows/macos-metal.yml index 1ce95b2..efd88a0 100644 --- a/.github/workflows/macos-metal.yml +++ b/.github/workflows/macos-metal.yml @@ -14,7 +14,8 @@ jobs: runs-on: macOS-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - name: Get Submodules run: ./get_dlc diff --git a/.github/workflows/macos-opengl.yml b/.github/workflows/macos-opengl.yml index e019c5a..8ce9b55 100644 --- a/.github/workflows/macos-opengl.yml +++ b/.github/workflows/macos-opengl.yml @@ -14,7 +14,8 @@ jobs: runs-on: macOS-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - name: Get Submodules run: ./get_dlc diff --git a/.github/workflows/uwp.yml b/.github/workflows/uwp.yml index 9c89922..16d8fda 100644 --- a/.github/workflows/uwp.yml +++ b/.github/workflows/uwp.yml @@ -14,7 +14,8 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - name: Get Submodules run: ./get_dlc diff --git a/.github/workflows/windows-direct3d11.yml b/.github/workflows/windows-direct3d11.yml index 7d71740..dc33e87 100644 --- a/.github/workflows/windows-direct3d11.yml +++ b/.github/workflows/windows-direct3d11.yml @@ -14,7 +14,8 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - name: Get Submodules run: ./get_dlc diff --git a/.github/workflows/windows-direct3d12.yml b/.github/workflows/windows-direct3d12.yml index 8dc0d12..41c3abd 100644 --- a/.github/workflows/windows-direct3d12.yml +++ b/.github/workflows/windows-direct3d12.yml @@ -14,7 +14,8 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - name: Get Submodules run: ./get_dlc diff --git a/.github/workflows/windows-direct3d9.yml b/.github/workflows/windows-direct3d9.yml index 482bdd0..bef352d 100644 --- a/.github/workflows/windows-direct3d9.yml +++ b/.github/workflows/windows-direct3d9.yml @@ -14,7 +14,8 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - name: Get Submodules run: ./get_dlc diff --git a/.github/workflows/windows-opengl.yml b/.github/workflows/windows-opengl.yml index 4d29892..8cd0343 100644 --- a/.github/workflows/windows-opengl.yml +++ b/.github/workflows/windows-opengl.yml @@ -14,7 +14,8 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - name: Get Submodules run: ./get_dlc diff --git a/write_workflows.js b/write_workflows.js index 9aa5350..c2fe287 100644 --- a/write_workflows.js +++ b/write_workflows.js @@ -50,7 +50,7 @@ jobs: runs-on: ${workflow.runsOn} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 ${steps} - name: Get Submodules run: ./get_dlc @@ -134,7 +134,7 @@ jobs: distro: ubuntu20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: uraimo/run-on-arch-action@v2.0.9 name: Run Tests in \${{ matrix.distro }} \${{ matrix.arch }} id: build @@ -216,6 +216,17 @@ function writeWorkflow(workflow) { return; } + const java = workflow.java +? +` + - uses: actions/setup-java@v3 + with: + distribution: 'oracle' + java-version: '17' +` +: +''; + const steps = workflow.steps ?? ''; const postfixSteps = workflow.postfixSteps ?? ''; @@ -236,7 +247,8 @@ jobs: runs-on: ${workflow.runsOn} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 +${java} ${steps} - name: Get Submodules run: ./get_dlc @@ -283,12 +295,14 @@ const workflows = [ { sys: 'Android', gfx: 'OpenGL', - runsOn: 'ubuntu-latest' + runsOn: 'ubuntu-latest', + java: true }, /*{ sys: 'Android', gfx: 'Vulkan', - runsOn: 'ubuntu-latest' + runsOn: 'ubuntu-latest', + java: true },*/ { sys: 'Emscripten',