Made lock happen right before build.
This commit is contained in:
@@ -57,14 +57,7 @@ runs:
|
|||||||
version: ${{ inputs.version }}
|
version: ${{ inputs.version }}
|
||||||
platform: ${{ inputs.platform }}
|
platform: ${{ inputs.platform }}
|
||||||
- name: "Pull Unity container."
|
- name: "Pull Unity container."
|
||||||
id: lock
|
|
||||||
run: |
|
run: |
|
||||||
LOCK_NAME="unity-lock:unity-lock"
|
|
||||||
echo "lockName=$LOCK_NAME" >> "$GITHUB_OUTPUT"
|
|
||||||
|
|
||||||
# Acquire Docker lock for exclusive access to retag the static image
|
|
||||||
bash ${{ github.action_path }}/acquire_lock.sh "$LOCK_NAME"
|
|
||||||
|
|
||||||
IMAGE_TAG="${{ inputs.imageTag }}"
|
IMAGE_TAG="${{ inputs.imageTag }}"
|
||||||
CONTAINER="${{ steps.getContainer.outputs.container }}"
|
CONTAINER="${{ steps.getContainer.outputs.container }}"
|
||||||
CACHED_CONTAINER="$CONTAINER-cached"
|
CACHED_CONTAINER="$CONTAINER-cached"
|
||||||
@@ -81,6 +74,11 @@ runs:
|
|||||||
COMMAND="-nographics $COMMAND"
|
COMMAND="-nographics $COMMAND"
|
||||||
fi
|
fi
|
||||||
echo "command=$COMMAND" >> "$GITHUB_OUTPUT"
|
echo "command=$COMMAND" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
LOCK_NAME="unity-lock:unity-lock"
|
||||||
|
echo "lockName=$LOCK_NAME" >> "$GITHUB_OUTPUT"
|
||||||
|
# Acquire Docker lock for exclusive access to retag the static image
|
||||||
|
bash ${{ github.action_path }}/acquire_lock.sh "$LOCK_NAME"
|
||||||
shell: bash
|
shell: bash
|
||||||
- name: "Run Unity command."
|
- name: "Run Unity command."
|
||||||
uses: act/unity/unity@master
|
uses: act/unity/unity@master
|
||||||
@@ -88,7 +86,7 @@ runs:
|
|||||||
SSH_PUBLIC_KEY: ${{ inputs.sshPublicKey }}
|
SSH_PUBLIC_KEY: ${{ inputs.sshPublicKey }}
|
||||||
SSH_PRIVATE_KEY: ${{ inputs.sshPrivateKey }}
|
SSH_PRIVATE_KEY: ${{ inputs.sshPrivateKey }}
|
||||||
CATCH_ERRORS: ${{ inputs.catchErrors }}
|
CATCH_ERRORS: ${{ inputs.catchErrors }}
|
||||||
LOCK_NAME: ${{ steps.lock.outputs.lockName }}
|
LOCK_NAME: ${{ steps.command.outputs.lockName }}
|
||||||
with:
|
with:
|
||||||
serial: ${{ inputs.serial }}
|
serial: ${{ inputs.serial }}
|
||||||
# serial: "activated"
|
# serial: "activated"
|
||||||
@@ -99,7 +97,7 @@ runs:
|
|||||||
- name: "Release Unity Docker lock."
|
- name: "Release Unity Docker lock."
|
||||||
if: ${{ always() }}
|
if: ${{ always() }}
|
||||||
run: |
|
run: |
|
||||||
LOCK_NAME="${{ steps.lock.outputs.lockName }}"
|
LOCK_NAME="${{ steps.command.outputs.lockName }}"
|
||||||
echo "Releasing Docker lock '$LOCK_NAME'..."
|
echo "Releasing Docker lock '$LOCK_NAME'..."
|
||||||
docker rmi "$LOCK_NAME" >/dev/null 2>&1 || true
|
docker rmi "$LOCK_NAME" >/dev/null 2>&1 || true
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|||||||
Reference in New Issue
Block a user