Skip to content

Commit e438a26

Browse files
committed
Add 'ignored_platforms' input. Fix typos. Add missed platforms
1 parent 8228a51 commit e438a26

File tree

1 file changed

+19
-14
lines changed

1 file changed

+19
-14
lines changed

.github/workflows/bob.yml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
required: false
1313
type: string
1414
description: 'Which MacOS runner should use'
15-
default: 'macOSlatest'
15+
default: macOS-latest
1616
windows_runner:
1717
required: false
1818
type: string
@@ -21,7 +21,7 @@ on:
2121
build_server:
2222
required: false
2323
type: string
24-
description: 'Buld server url'
24+
description: 'Build server url'
2525
default: 'https://build-stage.defold.com'
2626
channel:
2727
required: false
@@ -42,16 +42,21 @@ on:
4242
required: false
4343
type: string
4444
description: 'Additional options passed to bundle command'
45+
ignored_platforms:
46+
required: false
47+
type: string
48+
description: 'Comma-separated list of platforms that should be ignored'
49+
default: ''
4550

4651
jobs:
4752
build_with_bob:
4853
strategy:
4954
matrix:
50-
platform: [armv7-android, x86_64-linux, js-web]
55+
platform: [armv7-android, arm64-android, x86_64-linux, arm64-linux, js-web, wasm-web, wasm_pthread-web]
5156
fail-fast: false
5257
runs-on: ${{ inputs.ubuntu_runner }}
53-
5458
name: Build
59+
if: ${{ ! contains(inputs.ignored_platforms, matrix.platform) }}
5560
steps:
5661
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5762
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
@@ -81,18 +86,18 @@ jobs:
8186
- name: Resolve libraries
8287
run: java -jar bob.jar resolve
8388
- name: Build
84-
run: java -jar bob.jar --platform=${{ matrix.platform }} build --build-server=${{ inputs.build_server }} ${{ inputs.additonal_build_options }}
89+
run: java -jar bob.jar --platform=${{ matrix.platform }} --architectures ${{ matrix.platform }} build --build-server=${{ inputs.build_server }} ${{ inputs.additonal_build_options }}
8590
- name: Bundle
86-
run: java -jar bob.jar --platform=${{ matrix.platform }} bundle ${{ inputs.additonal_bundle_options }}
91+
run: java -jar bob.jar --platform=${{ matrix.platform }} --architectures ${{ matrix.platform }} bundle ${{ inputs.additonal_bundle_options }}
8792

8893
build_with_bob_windows:
8994
strategy:
9095
matrix:
9196
platform: [x86_64-win32, x86-win32]
9297
fail-fast: false
9398
runs-on: ${{ inputs.windows_runner }}
94-
9599
name: Build
100+
if: ${{ ! contains(inputs.ignored_platforms, matrix.platform) }}
96101
steps:
97102
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
98103
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
@@ -117,19 +122,19 @@ jobs:
117122
- name: Resolve libraries
118123
run: java -jar bob.jar resolve
119124
- name: Build
120-
run: java -jar bob.jar --platform=${{ matrix.platform }} build --build-server=${{ inputs.build_server }} ${{ inputs.additonal_build_options }}
125+
run: java -jar bob.jar --platform=${{ matrix.platform }} --architectures ${{ matrix.platform }} build --build-server=${{ inputs.build_server }} ${{ inputs.additonal_build_options }}
121126
- name: Bundle
122-
run: java -jar bob.jar --platform=${{ matrix.platform }} bundle ${{ inputs.additonal_bundle_options }}
127+
run: java -jar bob.jar --platform=${{ matrix.platform }} --architectures ${{ matrix.platform }} bundle ${{ inputs.additonal_bundle_options }}
123128

124129
# macOS is not technically needed for building, but we want to test bundling as well, since we're also testing the manifest merging
125130
build_with_bob_macos:
126131
strategy:
127132
matrix:
128-
platform: [arm64-macos, x86_64-macos]
133+
platform: [arm64-macos, x86_64-macos, arm64-ios]
129134
fail-fast: false
130-
runs-on: macOS-latest
131-
135+
runs-on: ${{ inputs.macos_runner }}
132136
name: Build
137+
if: ${{ ! contains(inputs.ignored_platforms, matrix.platform) }}
133138
steps:
134139
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
135140
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
@@ -153,6 +158,6 @@ jobs:
153158
- name: Resolve libraries
154159
run: java -jar bob.jar resolve
155160
- name: Build
156-
run: java -jar bob.jar --platform=${{ matrix.platform }} build --build-server=${{ inputs.build_server }} ${{ inputs.additonal_build_options }}
161+
run: java -jar bob.jar --platform=${{ matrix.platform }} --architectures ${{ matrix.platform }} build --build-server=${{ inputs.build_server }} ${{ inputs.additonal_build_options }}
157162
- name: Bundle
158-
run: java -jar bob.jar --platform=${{ matrix.platform }} bundle ${{ inputs.additonal_bundle_options }}
163+
run: java -jar bob.jar --platform=${{ matrix.platform }} --architectures ${{ matrix.platform }} bundle ${{ inputs.additonal_bundle_options }}

0 commit comments

Comments
 (0)