actions
/
unity-builder
mirror of https://github.com/game-ci/unity-builder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add resources folder to mounted docker volumes. Used by activation script to copy over template file for unity licensing server

pull/468/head
Simen Sandvaer 2022-10-14 13:56:33 +02:00
parent 4ba7a9dfe8
commit 6861abb19e
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dist/index.js vendored
View File

@ -4494,6 +4494,7 @@ class Docker {
--volume "${actionFolder}/default-build-script:/UnityBuilderAction:z" \ --volume "${actionFolder}/default-build-script:/UnityBuilderAction:z" \
--volume "${actionFolder}/platforms/ubuntu/steps:/steps:z" \ --volume "${actionFolder}/platforms/ubuntu/steps:/steps:z" \
--volume "${actionFolder}/platforms/ubuntu/entrypoint.sh:/entrypoint.sh:z" \ --volume "${actionFolder}/platforms/ubuntu/entrypoint.sh:/entrypoint.sh:z" \
--volume "${actionFolder}/resources:/resources:z" \
${sshAgent ? `--volume ${sshAgent}:/ssh-agent` : ''} \ ${sshAgent ? `--volume ${sshAgent}:/ssh-agent` : ''} \
${sshAgent ? '--volume /home/runner/.ssh/known_hosts:/root/.ssh/known_hosts:ro' : ''} \ ${sshAgent ? '--volume /home/runner/.ssh/known_hosts:/root/.ssh/known_hosts:ro' : ''} \
${image} \ ${image} \

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
dist/platforms/ubuntu/steps/activate.sh vendored
View File

@ -79,9 +79,10 @@ elif [[ -n "$UNITY_LICENSING_SERVER" ]]; then
# Custom Unity License Server # Custom Unity License Server
# #
echo "Adding licensing server config" echo "Adding licensing server config"
echo "folder $(pwd) action $(ACTION_FOLDER)" pwd
pushd /resources
cat $ACTION_FOLDER/resources/services-config.json.template | tr -d '\r' | sed -e "s/%URL%/$UNITY_LICENSING_SERVER/" > services-config.json pwd
cat services-config.json.template | tr -d '\r' | sed -e "s/%URL%/$UNITY_LICENSING_SERVER/" > services-config.json
mv services-config.json /usr/share/unity3d/config/ mv services-config.json /usr/share/unity3d/config/
cat /usr/share/unity3d/config/services-config.json cat /usr/share/unity3d/config/services-config.json
# Activate license # Activate license
@ -91,6 +92,7 @@ elif [[ -n "$UNITY_LICENSING_SERVER" ]]; then
# Store the exit code from the verify command # Store the exit code from the verify command
UNITY_EXIT_CODE=$? UNITY_EXIT_CODE=$?
popd
else else
# #
# NO LICENSE ACTIVATION STRATEGY MATCHED # NO LICENSE ACTIVATION STRATEGY MATCHED

1
src/model/docker.ts
View File

@ -38,6 +38,7 @@ class Docker {
--volume "${actionFolder}/default-build-script:/UnityBuilderAction:z" \ --volume "${actionFolder}/default-build-script:/UnityBuilderAction:z" \
--volume "${actionFolder}/platforms/ubuntu/steps:/steps:z" \ --volume "${actionFolder}/platforms/ubuntu/steps:/steps:z" \
--volume "${actionFolder}/platforms/ubuntu/entrypoint.sh:/entrypoint.sh:z" \ --volume "${actionFolder}/platforms/ubuntu/entrypoint.sh:/entrypoint.sh:z" \
--volume "${actionFolder}/resources:/resources:z" \
${sshAgent ? `--volume ${sshAgent}:/ssh-agent` : ''} \ ${sshAgent ? `--volume ${sshAgent}:/ssh-agent` : ''} \
${sshAgent ? '--volume /home/runner/.ssh/known_hosts:/root/.ssh/known_hosts:ro' : ''} \ ${sshAgent ? '--volume /home/runner/.ssh/known_hosts:/root/.ssh/known_hosts:ro' : ''} \
${image} \ ${image} \