Skip to content

Commit

Permalink
tweak tests, image name
Browse files Browse the repository at this point in the history
  • Loading branch information
erosson committed May 27, 2024
1 parent e238ad1 commit 953011d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ on:
# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
# IMAGE_NAME: ${{ github.repository }}
IMAGE_NAME: swarm/www.swarmsim.com

jobs:
build-and-push-image:
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ RUN yarn
COPY . /app/
# RUN . /usr/local/rvm/environments/default && yarn test
# docker seems upset if bower_components is a symlink, for some reason, so copy the whole thing. Works fine in the devcontainer and in CI. Ugh.
# openssl_conf: https://github.com/bazelbuild/rules_closure/issues/351#issuecomment-854628326 . Ugh.
RUN . /usr/local/rvm/environments/default &&\
(cd swarmsim-coffee && rm bower_components && cp -rp node_modules/@bower_components bower_components) &&\
yarn build
OPENSSL_CONF=/dev/null yarn build

# Run the static site we just built. No Caddyfile or other config, just static files.
# "The default config file simply serves files from /usr/share/caddy" - https://hub.docker.com/_/caddy
Expand Down
4 changes: 2 additions & 2 deletions swarmsim-coffee/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@
"_build:ts": "rm -rf ./dist/swarmsim-ts && cp -rp ./node_modules/@swarmsim/ts/dist/coffee-embed ./dist/swarmsim-ts",
"preversion": "yarn test",
"_pretest": "grunt pretest",
"test:unit": "OPENSSL_CONF=/dev/null karma start test/karma-unit.conf.coffee --singleRun",
"test:integration": "OPENSSL_CONF=/dev/null karma start test/karma-integration.conf.coffee --singleRun",
"test:unit": "karma start test/karma-unit.conf.coffee --singleRun",
"test:integration": "karma start test/karma-integration.conf.coffee --singleRun",
"test": "yarn _pretest && yarn test:unit && yarn test:integration"
}
}

0 comments on commit 953011d

Please sign in to comment.