Skip to content

fix: checkout demo tag #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 7, 2023
Merged

fix: checkout demo tag #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/docker-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ jobs:
- name: Test "${{ needs.init.outputs.docker-image-name }}:${{ needs.init.outputs.github-ci-sha-short }}-${{ matrix.image-variant }}" Docker Image
env:
DOCKER_IMAGE_NAME: ${{ needs.init.outputs.docker-image-name }}:${{ needs.init.outputs.github-ci-sha-short }}-${{ matrix.image-variant }}
EMS_VERSION: ${GITHUB_REF_NAME}
run: |
docker network create docker_default
docker pull appropriate/curl:latest
Expand Down
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ test-all: # Test [elasticms-website-skeleton] [prd,dev] variant Docker images

_tester-%:
@$(MAKE) -s _tester \
-e DOCKER_IMAGE_NAME="${DOCKER_IMAGE_NAME}:${ELASTICMS_WEB_VERSION}-$*"
-e DOCKER_IMAGE_NAME="${DOCKER_IMAGE_NAME}:${ELASTICMS_WEB_VERSION}-$*" \
-e EMS_VERSION="${ELASTICMS_WEB_VERSION}"

_tester:
@bats test/tests.bats
6 changes: 3 additions & 3 deletions test/tests.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export BATS_ELASTICMS_SKELETON_ENVIRONMENT="demo-preview-dev"

export BATS_STORAGE_SERVICE_NAME="postgresql"

export BATS_EMS_VERSION="${EMS_VERSION:-5.x}"
export BATS_DOCKER_IMAGE_NAME="${DOCKER_IMAGE_NAME:-docker.io/elasticms/website-skeleton:rc}"

export AWS_ACCESS_KEY_ID="${BATS_S3_ACCESS_KEY_ID}"
Expand All @@ -55,10 +56,9 @@ export BATS_REDIS_PORT="${BATS_REDIS_PORT:-6379}"
export BATS_VARNISH_ENABLED=${BATS_VARNISH_ENABLED:-"true"}
export BATS_METRICS_ENABLED=${BATS_METRICS_ENABLED:-"true"}

@test "[$TEST_FILE] Prepare Skeleton." {
@test "[$TEST_FILE] Prepare Skeleton [$BATS_EMS_VERSION]." {

# TODO : tag demo git repo to retrieve always the same code
run git clone --branch 5.x git@github.com:ems-project/elasticms-demo.git ${BATS_TEST_DIRNAME%/}/demo
run git clone -b ${BATS_EMS_VERSION} git@github.com:ems-project/elasticms-demo.git ${BATS_TEST_DIRNAME%/}/demo
run mkdir -p ${BATS_TEST_DIRNAME%/}/demo/dist
run npm install --save-dev webpack --prefix ${BATS_TEST_DIRNAME%/}/demo ${BATS_TEST_DIRNAME%/}/demo
run npm run --prefix ${BATS_TEST_DIRNAME%/}/demo prod
Expand Down