From 005803c4e67bb38dff67566c6699b688fc4917a0 Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Sun, 18 Oct 2020 13:40:20 +1100 Subject: [PATCH] sha --- .github/workflows/build-and-publish.yml | 2 +- docker/scripts/test.sh | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 2c92f6a..42f214f 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -27,5 +27,5 @@ jobs: run: ./docker/scripts/test.sh env: DESKTOP_ENVIRONMENT_REGISTRY: ghcr.io/${{ env.REPOSITORY_OWNER }} - DESKTOP_ENVIRONMENT_CONTAINER_TAG: ${{ github.ref }} + DESKTOP_ENVIRONMENT_CONTAINER_TAG: ${{ github.sha }} continue-on-error: true diff --git a/docker/scripts/test.sh b/docker/scripts/test.sh index 42322fe..bac675d 100755 --- a/docker/scripts/test.sh +++ b/docker/scripts/test.sh @@ -19,8 +19,6 @@ docker run \ $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE:$DESKTOP_ENVIRONMENT_CONTAINER_TAG \ sleep infinity -exit 1 - # Wait until the desktop environment test container is running before proceeding until docker inspect $DESKTOP_ENVIRONMENT_CONTAINER_NAME | grep Status | grep -m 1 running >/dev/null; do sleep 1; done