Skip to content

Commit fb05ff7

Browse files
StephenHodgsonStephenHodgson
authored
- updated xcode version handling - refactored action to be more robust and reliable
1 parent b5e19c4 commit fb05ff7

File tree

11 files changed

+1721
-1239
lines changed

11 files changed

+1721
-1239
lines changed

‎.github/workflows/build-options.json‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"os": [
3+
"macos-latest"
4+
],
5+
"unity-version": [
6+
"2021.x",
7+
"2022.x",
8+
"6000.0.x",
9+
"6000.1.x",
10+
"6000.2.x"
11+
],
12+
"build-target": [
13+
"StandaloneOSX",
14+
"iOS",
15+
"VisionOS"
16+
],
17+
"xcode-version": [
18+
"16.3",
19+
""
20+
],
21+
"exclude": [
22+
{
23+
"unity-version": "2021.x",
24+
"build-target": "VisionOS"
25+
},
26+
{
27+
"unity-version": "2022.x",
28+
"build-target": "VisionOS"
29+
}
30+
]
31+
}

‎.github/workflows/build.yml‎

Lines changed: 186 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
1+
name: build
2+
permissions:
3+
contents: read
4+
on:
5+
workflow_call:
6+
inputs:
7+
matrix:
8+
required: true
9+
type: string
10+
secrets:
11+
UNITY_USERNAME:
12+
required: true
13+
UNITY_PASSWORD:
14+
required: true
15+
jobs:
16+
build:
17+
name: ${{ matrix.name }}
18+
strategy:
19+
matrix: ${{ fromJSON(inputs.matrix) }}
20+
fail-fast: false
21+
runs-on: ${{ matrix.os }}
22+
permissions:
23+
contents: read
24+
env:
25+
VERSION: ''
26+
EXPORT_OPTION: ''
27+
BUILD_DIRECTORY: ''
28+
UNITY_PROJECT_PATH: ${{ github.workspace }}/UnityProject
29+
steps:
30+
- uses: actions/checkout@v4
31+
- run: 'npm install -g openupm-cli'
32+
- uses: RageAgainstThePixel/unity-setup@v1
33+
with:
34+
version-file: 'None'
35+
build-targets: ${{ matrix.build-target }}
36+
unity-version: ${{ matrix.unity-version }}
37+
- name: Set Build Args
38+
shell: bash
39+
run: |
40+
set -e
41+
# Read version from package.json instead of git tags
42+
package_json_path="${{ github.workspace }}/package.json"
43+
version=$(jq -r .version "$package_json_path")
44+
45+
if [[ "$version" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
46+
echo "Version from package.json: $version"
47+
else
48+
echo "Version: $version is not a valid version string"
49+
exit 1
50+
fi
51+
echo "VERSION=$version" >> "$GITHUB_ENV"
52+
53+
# Only set export option to app-store-connect if unity-version is 6000.2.x AND xcode-version is 16.4
54+
if [[ "${{ matrix.unity-version }}" == "6000.2.x" && "${{ matrix.xcode-version }}" == "16.2" ]]; then
55+
echo "EXPORT_OPTION=app-store-connect" >> "$GITHUB_ENV"
56+
else
57+
if [[ "${{ matrix.build-target }}" == "StandaloneOSX" ]]; then
58+
if [[ "${{ matrix.unity-version }}" == "2022.x" ]]; then
59+
echo "EXPORT_OPTION=steam" >> "$GITHUB_ENV"
60+
else
61+
echo "EXPORT_OPTION=developer-id" >> "$GITHUB_ENV"
62+
fi
63+
else
64+
echo "EXPORT_OPTION=development" >> "$GITHUB_ENV"
65+
fi
66+
fi
67+
68+
# set BUILD_DIRECTORY to a path in the root of the workspace named ./Builds/<build-target>/
69+
build_directory="${{ github.workspace }}/Builds/${{ matrix.build-target }}"
70+
echo "Creating build directory at $build_directory"
71+
mkdir -p "$build_directory"
72+
echo "BUILD_DIRECTORY=$build_directory" >> "$GITHUB_ENV"
73+
- uses: RageAgainstThePixel/activate-unity-license@v1
74+
with:
75+
license: 'Personal'
76+
username: ${{ secrets.UNITY_USERNAME }}
77+
password: ${{ secrets.UNITY_PASSWORD }}
78+
- uses: RageAgainstThePixel/create-unity-project@v1
79+
name: Create Test Project
80+
with:
81+
project-name: UnityProject
82+
template-name: com.unity.template.3d(-cross-platform)?
83+
- run: openupm add com.utilities.buildpipeline
84+
name: Add Build Pipeline Package
85+
working-directory: ${{ env.UNITY_PROJECT_PATH }}
86+
- uses: RageAgainstThePixel/unity-action@v2
87+
name: '${{ matrix.build-target }}-Validate'
88+
with:
89+
build-target: ${{ matrix.build-target }}
90+
log-name: '${{ matrix.build-target }}-Validate'
91+
args: '-quit -nographics -batchmode -executeMethod Utilities.Editor.BuildPipeline.UnityPlayerBuildTools.ValidateProject -importTMProEssentialsAsset'
92+
- uses: RageAgainstThePixel/unity-action@v2
93+
name: '${{ matrix.build-target }}-Build'
94+
with:
95+
build-target: ${{ matrix.build-target }}
96+
log-name: '${{ matrix.build-target }}-Build'
97+
args: '-quit -nographics -batchmode -executeMethod Utilities.Editor.BuildPipeline.UnityPlayerBuildTools.StartCommandLineBuild -sceneList Assets/Scenes/SampleScene.unity -export -enableAppleAutomaticSigning -bundleIdentifier com.rageagainstthepixel.xcode -versionName ${{ env.VERSION }} -buildOutputDirectory ${{ env.BUILD_DIRECTORY }}'
98+
- name: Update Info.Plist with encryption compliance
99+
shell: bash
100+
run: |
101+
set -e
102+
BUILD_DIRECTORY="${{ env.BUILD_DIRECTORY }}"
103+
104+
if [ -z "$BUILD_DIRECTORY" ]; then
105+
echo "env.BUILD_DIRECTORY is not set!"
106+
exit 1
107+
fi
108+
109+
# recursively list build output files
110+
echo "::group::Build Output Directory: ${BUILD_DIRECTORY}/com.rageagainstthepixel.xcode"
111+
ls -alR "${BUILD_DIRECTORY}/com.rageagainstthepixel.xcode"
112+
echo "::endgroup::"
113+
114+
# find the Info.plist file in the build directory
115+
# MacOSStandalone Info.plist path: /Users/runner/work/unity-xcode-builder/unity-xcode-builder/UnityProject/Builds/StandaloneOSX/com.rageagainstthepixel.xcode/UnityProject/UnityProject/Info.plist
116+
# all others: /Users/runner/work/unity-xcode-builder/unity-xcode-builder/UnityProject/Builds/iOS/com.rageagainstthepixel.xcode/Info.plist
117+
EXPORT_OPTION="${{ env.EXPORT_OPTION }}"
118+
119+
if [ "$EXPORT_OPTION" != "app-store-connect" ]; then
120+
exit 0
121+
fi
122+
123+
TARGET_PLATFORM="${{ matrix.build-target }}"
124+
125+
INFO_PLIST_PATH="${BUILD_DIRECTORY}/com.rageagainstthepixel.xcode/UnityProject/UnityProject/Info.plist"
126+
127+
if [ ! -f "$INFO_PLIST_PATH" ]; then
128+
INFO_PLIST_PATH="${BUILD_DIRECTORY}/com.rageagainstthepixel.xcode/Info.plist"
129+
fi
130+
131+
# test path exists
132+
if [ ! -f "$INFO_PLIST_PATH" ]; then
133+
echo "Info.plist not found at path: $INFO_PLIST_PATH"
134+
exit 1
135+
fi
136+
137+
# make sure plist buddy is installed
138+
if ! command -v /usr/libexec/PlistBuddy &> /dev/null
139+
then
140+
echo "PlistBuddy could not be found"
141+
# list build output files recursively
142+
ls -alR "${BUILD_DIRECTORY}/com.rageagainstthepixel.xcode"
143+
exit 1
144+
fi
145+
146+
# set ITSAppUsesNonExemptEncryption to false in Info.plist using PlistBuddy
147+
/usr/libexec/PlistBuddy -c "Add :ITSAppUsesNonExemptEncryption bool false" "$INFO_PLIST_PATH"
148+
- uses: ./ # RageAgainstThePixel/unity-xcode-builder
149+
id: xcode-build
150+
with:
151+
xcode-version: ${{ matrix.xcode-version }}
152+
project-path: ${{ env.BUILD_DIRECTORY }}/**/*.xcodeproj
153+
app-store-connect-key: ${{ secrets.APP_STORE_CONNECT_KEY }}
154+
app-store-connect-key-id: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
155+
app-store-connect-issuer-id: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
156+
team-id: ${{ secrets.APPLE_TEAM_ID }}
157+
export-option: ${{ env.EXPORT_OPTION }}
158+
notarize: ${{ env.EXPORT_OPTION != 'app-store-connect' }}
159+
archive-type: pkg
160+
test-groups: Beta
161+
developer-id-application-certificate: ${{ secrets.DEVELOPER_ID_APPLICATION_CERT }}
162+
developer-id-application-certificate-password: ${{ secrets.SIGNING_CERT_PASSWORD }}
163+
developer-id-installer-certificate: ${{ secrets.DEVELOPER_ID_INSTALLER_CERT }}
164+
developer-id-installer-certificate-password: ${{ secrets.SIGNING_CERT_PASSWORD }}
165+
- name: print outputs
166+
run: |
167+
set -e
168+
169+
EXECUTABLE="${{ steps.xcode-build.outputs.executable }}"
170+
171+
if [ -z "${EXECUTABLE}" ]; then
172+
echo "No executable found in outputs"
173+
exit 1
174+
fi
175+
176+
echo "Executable: ${EXECUTABLE}"
177+
OUTPUT_DIRECTORY="${{ steps.xcode-build.outputs.output-directory }}"
178+
179+
if [ -z "${OUTPUT_DIRECTORY}" ]; then
180+
echo "No output directory found in outputs"
181+
exit 1
182+
fi
183+
184+
echo "::group::Output Directory: ${OUTPUT_DIRECTORY}"
185+
ls -R "${OUTPUT_DIRECTORY}"
186+
echo "::endgroup::"

‎.github/workflows/validate.yml‎

Lines changed: 25 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -3,153 +3,40 @@ on:
33
push:
44
branches: ['main']
55
pull_request:
6-
types: [opened, reopened, synchronize, ready_for_review]
76
branches: ['*']
8-
# Allows you to run this workflow manually from the Actions tab
9-
workflow_dispatch:
7+
types: [opened, reopened, synchronize, ready_for_review]
8+
workflow_dispatch: # Allows you to run this workflow manually from the Actions tab
109
concurrency:
1110
group: ${{ github.workflow }}-${{ github.ref }}
1211
cancel-in-progress: true
1312
jobs:
14-
unity-build:
13+
setup:
1514
if: github.event.pull_request.draft == false
16-
name: '(${{ matrix.unity-version }}) ${{ matrix.build-target }}'
15+
runs-on: ubuntu-latest
1716
permissions:
1817
contents: read
19-
env:
20-
VERSION: ''
21-
TEMPLATE_PATH: ''
22-
EXPORT_OPTION: ''
23-
UNITY_PROJECT_PATH: ''
24-
runs-on: ${{ matrix.os }}
25-
strategy:
26-
fail-fast: false
27-
matrix:
28-
os: [macos-latest]
29-
unity-version: [2021.x, 2022.x, 6000.x]
30-
build-target: [iOS, StandaloneOSX, VisionOS]
31-
exclude:
32-
- os: macos-latest
33-
unity-version: 2021.x
34-
build-target: VisionOS
35-
- os: macos-latest
36-
unity-version: 2022.x
37-
build-target: VisionOS
3818
steps:
3919
- uses: actions/checkout@v4
40-
- run: 'npm install -g openupm-cli'
41-
- uses: RageAgainstThePixel/unity-setup@v1
42-
with:
43-
version-file: 'None'
44-
build-targets: ${{ matrix.build-target }}
45-
unity-version: ${{ matrix.unity-version }}
46-
- name: Find Unity Template Path and Version
47-
run: |
48-
$rootPath = $env:UNITY_EDITOR_PATH -replace "Editor.*", ""
49-
Write-Host "ROOT_PATH=$rootPath"
50-
$templatePath = Get-ChildItem -Recurse -Filter "com.unity.template.3d*.tgz" -Path $rootPath | Select-Object -First 1 | Select-Object -ExpandProperty FullName
51-
Write-Host "TEMPLATE_PATH=$templatePath"
52-
echo "TEMPLATE_PATH=$templatePath" >> $env:GITHUB_ENV
53-
$projectPath = "${{ github.workspace }}/UnityProject"
54-
echo "UNITY_PROJECT_PATH=$projectPath" >> $env:GITHUB_ENV
55-
56-
# Read version from package.json instead of git tags
57-
$packageJsonPath = "${{ github.workspace }}/package.json"
58-
$packageJson = Get-Content -Raw -Path $packageJsonPath | ConvertFrom-Json
59-
$version = $packageJson.version
60-
61-
if ($version -match '^\d+\.\d+\.\d+$') {
62-
Write-Host "Version from package.json: $version"
63-
} else {
64-
Write-Host "Version: $version is not a valid version string"
65-
exit 1
66-
}
67-
echo "VERSION=$version" >> $env:GITHUB_ENV
68-
69-
# if the unity-version is 6000.x then set export option to app-store-connect otherwise set it to development
70-
if ('${{ matrix.unity-version }}' -eq '6000.x') {
71-
echo "EXPORT_OPTION=app-store-connect" >> $env:GITHUB_ENV
72-
} else {
73-
if ('${{ matrix.build-target }}' -eq 'StandaloneOSX') {
74-
if ('${{ matrix.unity-version }}' -eq '2022.x') {
75-
echo "EXPORT_OPTION=steam" >> $env:GITHUB_ENV
76-
} else {
77-
echo "EXPORT_OPTION=developer-id" >> $env:GITHUB_ENV
78-
}
79-
} else {
80-
echo "EXPORT_OPTION=development" >> $env:GITHUB_ENV
81-
}
82-
}
83-
shell: pwsh
84-
- uses: RageAgainstThePixel/activate-unity-license@v1
85-
with:
86-
license: 'Personal'
87-
username: ${{ secrets.UNITY_USERNAME }}
88-
password: ${{ secrets.UNITY_PASSWORD }}
89-
- uses: RageAgainstThePixel/unity-action@v1
90-
name: Create Test Project
9120
with:
92-
log-name: 'create-test-project'
93-
args: '-quit -nographics -batchmode -createProject "${{ github.workspace }}/UnityProject" -cloneFromTemplate "${{ env.TEMPLATE_PATH }}"'
94-
- run: openupm add com.utilities.buildpipeline
95-
name: Add Build Pipeline Package
96-
working-directory: ${{ github.workspace }}/UnityProject
97-
- uses: RageAgainstThePixel/unity-action@v1
98-
name: '${{ matrix.build-target }}-Validate'
21+
sparse-checkout: .github/
22+
- uses: RageAgainstThePixel/job-builder@v1
23+
id: setup-jobs
9924
with:
100-
build-target: ${{ matrix.build-target }}
101-
log-name: '${{ matrix.build-target }}-Validate'
102-
args: '-quit -nographics -batchmode -executeMethod Utilities.Editor.BuildPipeline.UnityPlayerBuildTools.ValidateProject -importTMProEssentialsAsset'
103-
- uses: RageAgainstThePixel/unity-action@v1
104-
name: '${{ matrix.build-target }}-Build'
105-
with:
106-
build-target: ${{ matrix.build-target }}
107-
log-name: '${{ matrix.build-target }}-Build'
108-
args: '-quit -nographics -batchmode -executeMethod Utilities.Editor.BuildPipeline.UnityPlayerBuildTools.StartCommandLineBuild -sceneList Assets/Scenes/SampleScene.unity -export -enableAppleAutomaticSigning -bundleIdentifier com.rageagainstthepixel.xcode -versionName ${{ env.VERSION }}'
109-
- name: Update Info.Plist with encryption compliance
110-
shell: bash
111-
run: |
112-
set -xe
113-
# find the Info.plist file in the build directory
114-
# MacOSStandalone Info.plist path: /Users/runner/work/unity-xcode-builder/unity-xcode-builder/UnityProject/Builds/StandaloneOSX/com.test.buildalon.xcode/UnityProject/UnityProject/Info.plist
115-
# all others: /Users/runner/work/unity-xcode-builder/unity-xcode-builder/UnityProject/Builds/iOS/com.test.buildalon.xcode/Info.plist
116-
EXPORT_OPTION=${{ env.EXPORT_OPTION }}
117-
if [ "$EXPORT_OPTION" != "app-store-connect" ]; then
118-
exit 0
119-
fi
120-
TARGET_PLATFORM=${{ matrix.build-target }}
121-
if [ "$TARGET_PLATFORM" == "StandaloneOSX" ]; then
122-
INFO_PLIST_PATH="${{ env.UNITY_PROJECT_PATH }}/Builds/${{ matrix.build-target }}/com.test.buildalon.xcode/UnityProject/UnityProject/Info.plist"
123-
else
124-
INFO_PLIST_PATH="${{ env.UNITY_PROJECT_PATH }}/Builds/${{ matrix.build-target }}/com.test.buildalon.xcode/Info.plist"
125-
fi
126-
# make sure plist buddy is installed
127-
if ! command -v /usr/libexec/PlistBuddy &> /dev/null
128-
then
129-
echo "PlistBuddy could not be found"
130-
exit 1
131-
fi
132-
# set ITSAppUsesNonExemptEncryption to false in Info.plist using PlistBuddy
133-
/usr/libexec/PlistBuddy -c "Add :ITSAppUsesNonExemptEncryption bool false" "$INFO_PLIST_PATH"
134-
- uses: ./ # RageAgainstThePixel/unity-xcode-builder
135-
id: xcode-build
136-
with:
137-
project-path: ${{ env.UNITY_PROJECT_PATH }}/Builds/${{ matrix.build-target }}/**/*.xcodeproj
138-
app-store-connect-key: ${{ secrets.APP_STORE_CONNECT_KEY }}
139-
app-store-connect-key-id: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
140-
app-store-connect-issuer-id: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
141-
team-id: ${{ secrets.APPLE_TEAM_ID }}
142-
export-option: ${{ env.EXPORT_OPTION }}
143-
notarize: ${{ matrix.unity-version != '6000.x' }}
144-
archive-type: pkg
145-
test-groups: Beta
146-
developer-id-application-certificate: ${{ secrets.DEVELOPER_ID_APPLICATION_CERT }}
147-
developer-id-application-certificate-password: ${{ secrets.SIGNING_CERT_PASSWORD }}
148-
developer-id-installer-certificate: ${{ secrets.DEVELOPER_ID_INSTALLER_CERT }}
149-
developer-id-installer-certificate-password: ${{ secrets.SIGNING_CERT_PASSWORD }}
150-
- name: print outputs
151-
if: always()
152-
run: |
153-
echo "Executable: ${{ steps.xcode-build.outputs.executable }}"
154-
echo "Output Directory: ${{ steps.xcode-build.outputs.output-directory }}"
155-
ls -R "${{ steps.xcode-build.outputs.output-directory }}"
25+
build-options: ./.github/workflows/build-options.json
26+
group-by: 'unity-version'
27+
outputs:
28+
jobs: ${{ steps.setup-jobs.outputs.jobs }}
29+
validate:
30+
if: ${{ needs.setup.outputs.jobs }}
31+
needs: setup
32+
name: build ${{ matrix.jobs.name }}
33+
permissions:
34+
contents: read
35+
strategy:
36+
matrix: ${{ fromJSON(needs.setup.outputs.jobs) }}
37+
fail-fast: false
38+
max-parallel: 1
39+
secrets: inherit
40+
uses: ./.github/workflows/build.yml
41+
with:
42+
matrix: ${{ toJSON(matrix.jobs.matrix) }}

0 commit comments

Comments
 (0)