diff --git a/unity-command/action.yaml b/unity-command/action.yaml index 712695a..7d867d2 100644 --- a/unity-command/action.yaml +++ b/unity-command/action.yaml @@ -45,21 +45,19 @@ runs: CONTAINER="${{ steps.getContainer.outputs.container }}" CACHED_CONTAINER="$CONTAINER-activated" - if [[ -z "$(docker image ls | grep $CACHED_CONTAINER)" ]]; then - # Activate the license on build. - DOCKER_BUILDKIT=1 \ - SERIAL="${{ inputs.serial }}" USERNAME="${{ inputs.email }}" PASSWORD="${{ inputs.password }}" \ - docker build --secret id=SERIAL,env=SERIAL --secret id=USERNAME,env=USERNAME --secret id=PASSWORD,env=PASSWORD \ - -t $CACHED_CONTAINER --build-arg IMAGE=$CONTAINER ${{ github.action_path }} - fi + # Activate the license on build. + # DOCKER_BUILDKIT=1 \ + # SERIAL="${{ inputs.serial }}" USERNAME="${{ inputs.email }}" PASSWORD="${{ inputs.password }}" \ + docker build --secret id=SERIAL,env=SERIAL --secret id=USERNAME,env=USERNAME --secret id=PASSWORD,env=PASSWORD \ + -t $CACHED_CONTAINER --build-arg IMAGE=$CONTAINER ${{ github.action_path }} docker tag $CACHED_CONTAINER ${{ inputs.imageTag }} shell: bash - name: "Run Unity command." uses: act/unity/unity@master with: - # serial: ${{ inputs.serial }} - serial: "activated" + serial: ${{ inputs.serial }} + # serial: "activated" email: ${{ inputs.email }} password: ${{ inputs.password }} command: ${{ inputs.command }} diff --git a/unity-command/entrypoint.sh b/unity-command/entrypoint.sh index 32e7590..6a7f13d 100644 --- a/unity-command/entrypoint.sh +++ b/unity-command/entrypoint.sh @@ -5,8 +5,8 @@ DEFAULT_ARGS="-quit -logFile -" rm -rf $HOME/.config/unity3d rm -rf /home/unity/.config/unity3d -ls -al Library -exit 0 +ls -al +#exit 0 #Add ssh key information for resolving packages. bash /scripts/add_ssh_keys.sh diff --git a/unity-project/action.yaml b/unity-project/action.yaml index b0ea9ec..95310d5 100644 --- a/unity-project/action.yaml +++ b/unity-project/action.yaml @@ -64,6 +64,6 @@ runs: if: ${{ inputs.cacheVolume }} uses: act/common/docker/docker-cp@master with: - recreateVolume: true + recreateVolume: false volume: ${{ inputs.cacheVolume }} fromPath: Library